Andrew Steinborn 5ff36f1ae7 Merge branch 'master' into plugin-message-event ... # Conflicts: # proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java # proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java		2018-09-16 02:35:38 -04:00
..
src	Merge branch 'master' into plugin-message-event	2018-09-16 02:35:38 -04:00
build.gradle	Include git revision and build number	2018-09-03 21:02:11 -04:00