Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.20' into 1.21
Browse files Browse the repository at this point in the history
# Conflicts:
#	client/src/main/java/folk/sisby/switchy/SwitchyClientServer.java
#	client/src/main/java/folk/sisby/switchy/client/SwitchyClientReceivers.java
#	client/src/main/java/folk/sisby/switchy/client/api/SwitchyClientApi.java
#	compat-ui/build.gradle
#	compat/build.gradle
#	compat/src/main/java/folk/sisby/switchy/modules/ApoliModule.java
#	compat/src/main/java/folk/sisby/switchy/modules/PehkuiModule.java
#	core/src/main/java/folk/sisby/switchy/api/module/SwitchyModuleInfo.java
#	core/src/main/java/folk/sisby/switchy/util/Feedback.java
  • Loading branch information
sisby-folk committed Aug 28, 2024
2 parents 187bbdb + 3be9099 commit 1c6876e
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 1c6876e

Please sign in to comment.