KennyTV 704f946cf7 Merge remote-tracking branch 'origin/master' into abstraction ... # Conflicts: # bukkit/pom.xml # bungee/pom.xml # common/pom.xml # jar/pom.xml # pom.xml # sponge-legacy/pom.xml # sponge/pom.xml # velocity/pom.xml		2020-01-21 16:07:42 +01:00
..
src	Merge remote-tracking branch 'origin/master' into abstraction	2020-01-21 16:07:42 +01:00
pom.xml	1.15.2 support	2020-01-21 16:05:26 +01:00