Skip to content
GitLab
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
parents 5694dcd3 db4009d1
Show 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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal