Merge branch 'dev' into 'git-pipeline'

# Conflicts:
#   .gitlab-ci.yml
This commit is contained in:
Harmony 2020-05-04 13:46:12 -04:00
commit 410a50ba45

View File

@ -15,3 +15,4 @@ build:
expire_in: 2 weeks
paths:
- target/Habbo-*.jar