Conrad S ccf9d4a4c2 Merge remote-tracking branch 'origin/clans/beta' into clans/beta ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java		2016-04-09 13:01:04 -04:00
..
src/mineplex/game/clans	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-04-09 13:01:04 -04:00
plugin.yml	Clans to buildable state.	2014-11-27 22:34:20 -08:00
pom.xml	Use Maven for Compilation	2016-01-20 11:20:58 +11:00