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

Merge branch 'main' into develop 

# Conflicts:
#	backend/main/java/de/griefed/serverpackcreator/ServerPackHandler.java
#	build.gradle
#	frontend/package-lock.json
#	frontend/package.json
parents 4ea5e443 aa2b7a16
No related branches found
No related tags found
Expand all 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