Commit e9d7307e authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into '79-add-viktor-to-humans-txt'

# Conflicts:
#   html/humans.txt
parents 05a936e9 e9747512
Pipeline #1597 passed with stages
in 4 minutes and 58 seconds