Commit 91fc90c4 authored by Alessandro Viprati's avatar Alessandro Viprati

Merge branch 'develop' into 'scopri-ubuntu'

# Conflicts:
#   uitwww/data/downloads.toml
parents c42184be e6f5e7fe
Pipeline #109 running with stage