Skip to content
GitLab
Commit 3ce8b3fe authored by Francesco's avatar Francesco
Browse files

Merge branch 'master' into 'dev-fixes' 

# Conflicts:
#   assets/custom-functions.js
#   assets/style.css
#   data_handler.py
parents b5f1a080 5df088c0
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment