Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ServerPackCreator
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

c7cc2b92

Commit c7cc2b92 authored 3 months ago by Griefed

Downloads
- Plain Diff

Merge branch 'develop' into 'main'

develop

See merge request !631

parents 2fc0bc99 bb486649

1 merge request!631develop

Checking pipeline status

Changes 3
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 17 additions, 17 deletions

.gitlab-ci.yml
serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt 3 additions, 0 deletions

.../kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt
serverpackcreator-api/src/main/resources/serverpackcreator.properties 1 addition, 1 deletion

...eator-api/src/main/resources/serverpackcreator.properties

with 21 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Me haz all ze repositoriiiiiiiiiiiiiiiiiies