Commit b34d6f9e authored by TUHH GitLab Administrator (Andreas Böttger)'s avatar TUHH GitLab Administrator (Andreas Böttger)
Browse files

Merge branch 'development' into 'master'

# Conflicts:
#   .gitlab-ci.yml
parents 6dc78d26 d93d1345
......@@ -137,7 +137,7 @@ review:stop:
name: $CI_COMMIT_REF_NAME
action: stop
deploy:
.deploy:
stage: deploy
only:
- master
......
# Introduction
lorem ipsum ipsum
\ No newline at end of file
Markdown is supported
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