Andrew Steinborn b1b3882fab Merge branch 'Xernium-future/1.17' into dev/3.0.0 ... # Conflicts: # api/src/main/java/com/velocitypowered/api/proxy/ProxyServer.java # proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java		2021-06-06 03:48:49 -04:00
..
src	Merge branch 'Xernium-future/1.17' into dev/3.0.0	2021-06-06 03:48:49 -04:00
build.gradle	Fix Java 11 Javadoc URL	2021-05-23 17:21:44 -04:00
HEADER.txt	Relicense the Velocity proxy under the terms of GPLv3 (#448)	2021-03-31 16:04:06 -04:00
LICENSE	Relicense the Velocity proxy under the terms of GPLv3 (#448)	2021-03-31 16:04:06 -04:00