Tim203 5b317ec595 Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # Conflicts: # bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java # bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotConfiguration.java # connector/src/main/java/org/geysermc/connector/GeyserConnector.java # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java		2020-09-19 14:40:12 +02:00
..
src/main	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2020-09-19 14:40:12 +02:00
pom.xml	Relocate Google Common (#1242)	2020-09-02 23:42:53 -04:00