Verified Commit 37ab6a0f authored 3 years ago by Griefed

Merge branch 'GL127' into develop

# Conflicts:
#	backend/main/java/de/griefed/serverpackcreator/ApplicationPlugins.java
#	backend/main/java/de/griefed/serverpackcreator/swing/TabCreateServerPack.java

parents b20979d2 8c8c0d13

No related branches found

No related tags found

This commit is part of merge request !215. Comments created here will be created in the context of that merge request.

Hide whitespace changes

Inline Side-by-side

Showing with 215 additions and 40 deletions

Please register or to comment