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

..

src

Merge branch 'master' into native-crypto

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

build.gradle

Plugin API (#34)

2018-08-20 19:30:32 -04:00