Skip to content
GitLab
Commit ac54b715 authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge branch 'master' into 'prepare_production' 

# Conflicts:
#   mymodule/themes/fancytheme/core/loginuserpass.php
parents 3608a544 fa1f5124
master knopkiwg-master-patch-25739
2 merge requests!57Knopkiwg master patch 25739,!14Prepare production
Show whitespace changes
Inline Side-by-side
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

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