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	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
ascii.png	Fix ascii.png duplication.	2016-01-21 17:47:21 +11:00
pom.xml	Remove googles http api (no longer needed) and add apache http to core.common	2016-05-24 17:23:17 +10:00