KennyTV 4355f8987f Merge branch 'master' into dev ... # 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-12-15 11:16:57 +01:00
..
src	Merge branch 'master' into dev	2020-12-15 11:16:57 +01:00
pom.xml	Snapshot	2020-12-12 13:16:13 +00:00