GeyserMC/bootstrap/bungeecord
Tim203 776fc4e933
Merge remote-tracking branch 'origin/master' into floodgate-2.0
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java
2021-05-26 02:17:33 +02:00
..
src/main Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-02-01 12:02:49 +01:00
pom.xml Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-05-26 02:17:33 +02:00