Skip to content
Snippets Groups Projects
Verified Commit eb4dc706 authored by Griefed's avatar Griefed :joystick:
Browse files

Merge branch 'develop' of https://git.griefed.de/Griefed/ServerPackCreator into develop 

# Conflicts:
#	serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt
#	serverpackcreator-api/src/main/resources/serverpackcreator.properties
parents 2fa65f36 9023a0a0
No related branches found
No related tags found
1 merge request!638Multiple clientside-mods additions
Pipeline #9216 failed
Stage: Tests
Stage: Documentation
Hide whitespace changes
Inline Side-by-side
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

Me haz all ze repositoriiiiiiiiiiiiiiiiiies