Keir Nellyer 323d865b57 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java		2016-06-24 18:13:51 +01:00
..
src/mineplex/game/clans	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-24 18:13:51 +01: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