Andrew Steinborn a37a0d6665 Merge branch 'master' into native-crypto ...

# Conflicts:
#	native/src/main/java/com/velocitypowered/natives/util/Natives.java

2018-08-25 01:12:26 -04:00

..

main

Merge branch 'master' into native-crypto

2018-08-25 01:12:26 -04:00

test/java/com/velocitypowered/proxy

Massively improved Javadoc coverage to prepare for Javadoc site.

2018-08-25 00:29:22 -04:00