Andrew Steinborn e32fc42aaf Merge branch 'dev/1.1.0' into dev/2.0.0 ...

# Conflicts:
#	api/src/main/java/com/velocitypowered/api/command/CommandManager.java

2020-10-22 03:02:50 -04:00

..

src

Merge branch 'dev/1.1.0' into dev/2.0.0

2020-10-22 03:02:50 -04:00

build.gradle

Track some dependency updates

2020-09-15 13:27:16 +02:00