KennyTV 5f1472a18d Merge branch 'dev' into master ... # Conflicts: # bukkit-legacy/pom.xml # bukkit/pom.xml # bungee/pom.xml # common/pom.xml # fabric/pom.xml # jar/pom.xml # pom.xml # sponge-legacy/pom.xml # sponge/pom.xml # velocity/pom.xml		2020-09-10 16:37:35 +02:00
..
src	Merge branch 'dev' into master	2020-09-10 16:37:35 +02:00
pom.xml	3.1.1 Release, 1.16.3 support	2020-09-09 15:50:13 +02:00