NewGarbo ae2da31544 Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java		2016-03-05 23:14:32 +00:00
..
src/mineplex/core	Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-03-05 23:14:32 +00:00
pom.xml	Include version.properties in Mineplex.Core	2016-01-21 16:37:35 -05:00
version.properties	Include version.properties in Mineplex.Core	2016-01-21 16:37:35 -05:00