Shaun Bennett 876a568bd0 Merge remote-tracking branch 'origin/clans/beta' into clans/beta ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java		2016-03-08 12:17:07 -06:00
..
src/mineplex/minecraft/game/classcombat	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-03-08 12:17:07 -06:00
pom.xml	Use Maven for Compilation	2016-01-20 11:20:58 +11:00