KennyTV 4817bf7e2b Merge branch 'dev' into master ... # Conflicts: # all/pom.xml # bukkit/pom.xml # bungee/pom.xml # core/pom.xml # fabric/pom.xml # pom.xml # sponge/pom.xml # velocity/pom.xml		2020-09-10 16:33:23 +02:00
..
src/main	Merge branch 'dev' into master	2020-09-10 16:33:23 +02:00
pom.xml	3.1.1 Release, 1.16.3 support	2020-09-09 15:48:26 +02:00