Andrew Steinborn a083dfd3a4 Merge branch 'master' into reload-command ...

# Conflicts:
#	proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java

2018-11-24 21:41:12 -05:00

..

src

Merge branch 'master' into reload-command

2018-11-24 21:41:12 -05:00

build.gradle

Allow specifying bind port via command line

2018-11-20 21:56:34 -08:00