Keir Nellyer 1854b71757 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java		2016-08-05 17:05:01 +01:00
..
src	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-08-05 17:05:01 +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