Keir Nellyer 6a00f26d5f Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java		2016-04-29 23:42:27 +01:00
..
nautilus/game/arcade	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-04-29 23:42:27 +01:00