Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.21.x' into 1.21.x
Browse files Browse the repository at this point in the history 
# Conflicts:
#	gradle.properties
  • Loading branch information
@BlayTheNinth
BlayTheNinth committed Aug 12, 2024
2 parents 6e6e257 + 3cff47e commit 54d7587
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 54d7587

Please sign in to comment.