Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.20.x' into 1.20.x
Browse files Browse the repository at this point in the history 
# Conflicts:
#	gradle.properties
  • Loading branch information
@BlayTheNinth
BlayTheNinth committed May 19, 2024
2 parents d7896a5 + 6c09d9f commit 02daf6b
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 02daf6b

Please sign in to comment.