dordsor21 ee9b2e8bf8

Just merge the whole thing. Merge branch 'v6' into features/v6/queue-features ...

# Conflicts:
#	Core/src/main/resources/lang/messages_en.json

2020-11-01 18:58:24 +00:00

..

src/main

Just merge the whole thing. Merge branch 'v6' into features/v6/queue-features

2020-11-01 18:58:24 +00:00

build.gradle.kts

Update paperlib

2020-11-01 17:17:12 +01:00