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

Merge branch 'renovate-org.apache.logging.log4j-log4j-core-2.x' of... 

Merge branch 'renovate-org.apache.logging.log4j-log4j-core-2.x' of https://git.griefed.de/Griefed/ServerPackCreator into develop

# Conflicts:
#	build.gradle
parents 41fc3a13 d2f24e1d
No related branches found
No related tags found
1 merge request!263Merge develop into main
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
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