Andrew Steinborn 275685f45f Merge branch 'master' into dev/1.1.0 ...

# Conflicts:
#	build.gradle

2019-06-30 23:52:22 -04:00

..

main

Merge branch 'master' into dev/1.1.0

2019-06-30 23:52:22 -04:00

test/java/com/velocitypowered/proxy

Remove protocol linking (#212)

2019-06-02 19:44:23 -04:00