KennyTV a9c49d948a Merge remote-tracking branch 'upstream/master' into dev ... # Conflicts: # bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaConfig.java # bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaConfig.java # common/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java # common/src/main/resources/assets/viaversion/config.yml # sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java # velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java		2019-10-02 16:21:37 +02:00
..
main	Merge remote-tracking branch 'upstream/master' into dev	2019-10-02 16:21:37 +02:00
test/java/us/myles/ViaVersion/common/test/type	Missed one - oops	2018-11-17 13:47:58 +00:00