Andrew Steinborn 35856fec04 Merge branch 'dev/1.1.0' into natives-java-improvements ... # Conflicts: # native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java		2019-09-07 00:06:13 -04:00
..
src	Merge branch 'dev/1.1.0' into natives-java-improvements	2019-09-07 00:06:13 -04:00
build.gradle	Add support for ping pass-through	2019-08-06 02:06:53 -04:00