Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/upstream/1.18' into 1.20
Browse files Browse the repository at this point in the history 
# Conflicts:
#	common/src/main/resources/assets/antiqueatlas/lang/de_de.json
  • Loading branch information
@sisby-folk
sisby-folk committed Aug 23, 2024
2 parents 180ec82 + 35a652c commit 62ea4ef
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 62ea4ef

Please sign in to comment.