Shaun Bennett fd843b88cb Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java # Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java		2016-06-23 23:02:26 -07:00
..
src	Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final	2016-06-23 23:02:26 -07: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