Merge branch 'dev' into 'git-pipeline'

# Conflicts: # .gitlab-ci.yml
2020-05-04 13:46:12 -04:00 · 2020-05-04 13:46:12 -04:00 · 410a50ba45
parent 9762d41aae 569205b991
commit 410a50ba45
1 changed files with 1 additions and 0 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -15,3 +15,4 @@ build:
    expire_in: 2 weeks
    paths:
      - target/Habbo-*.jar
+