Skip to content
GitLab
Commit fcdd96d9 authored by Rosanny Sihombing's avatar Rosanny Sihombing
Browse files

Merge branch 'testing' into 'MLAB-576' 

# Conflicts:
#   views/DE/project/pagesList.pug
#   views/DE/project/projectList.pug
parents f02a41c3 50427a49
master devel testing
4 merge requests!86ignore ts built folder,!85deployment,!84prepare deployment,!69Mlab 576
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