Skip to content

Commit

Permalink
Merge branch '1.20.1'
Browse files Browse the repository at this point in the history
* 1.20.1:
  Fixed server

# Conflicts:
#	forge/src/main/java/com/faboslav/friendsandfoes/platform/forge/PacketChannelManagerImpl.java
  • Loading branch information
Faboslav committed Dec 10, 2023
2 parents f600d48 + 50ddf69 commit 358d50a
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 358d50a

Please sign in to comment.