GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity
Geyser/bootstrap/spigot
History
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-05-26 02:17:33 +02:00
pom.xml Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-05-26 02:17:33 +02:00