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

# Conflicts:
#	build.gradle

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

..

ap

An Easter basket bearing gifts! (#191)

2019-04-24 14:36:49 -04:00

main/java/com/velocitypowered/api

Merge branch 'master' into dev/1.1.0

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

test/java/com/velocitypowered/api

Fix Checkstyle issues

2019-04-21 02:56:29 -04:00