Andrew Steinborn 869f2a6b32 Merge branch 'dev/1.1.0' into decode-multiple		2020-05-29 21:37:10 -04:00
..
java/com/velocitypowered/proxy	Merge branch 'dev/1.1.0' into decode-multiple	2020-05-29 21:37:10 -04:00
resources	Update TerminalConsoleAppender to 1.2.0	2019-07-21 16:51:08 +02:00