Skip to content
Snippets Groups Projects

Milestone 3.x progress

Merged Milestone 3.x progress
develop into main
Merged Griefed requested to merge develop into main
Viewing commit 37ab6a0f
Prev Next
Show latest version
Compare changes
  • Side-by-side
  • Inline
Files
9
  • 37ab6a0f
    Griefed
    Merge branch 'GL127' into develop · 37ab6a0f
    Griefed authored 
    # Conflicts:
#	backend/main/java/de/griefed/serverpackcreator/ApplicationPlugins.java
#	backend/main/java/de/griefed/serverpackcreator/swing/TabCreateServerPack.java

Me haz all ze repositoriiiiiiiiiiiiiiiiiies