Commit 2cb49313 authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge branch 'master' into 'prepare_production'

# Conflicts:
#   .gitlab-ci.yml
#   index.html
#   js/headfoot.js
2 merge requests!86Mlab 436,!32Prepare production
Showing with 0 additions and 0 deletions
+0 -0
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