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
Loading
Loading
Loading
Loading
+1 −1
Changes for .gitlab-ci.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ review:stop:
    name: $CI_COMMIT_REF_NAME
    action: stop
    
deploy:
.deploy:
    stage: deploy
    only:
        - master

introduction.md

0 → 100644
+3 −0
Changes for introduction.md: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
# Introduction

lorem ipsum ipsum
 No newline at end of file