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
..
customerSupport	Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final	2016-06-23 23:02:26 -07:00
helpdesk	Enabled snake parkour	2014-08-22 22:53:15 -05:00
password	Use DBPool for everything	2016-02-19 00:17:38 -06:00
salespackage	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-06-23 16:11:49 -03:00
StaffServer.java	Incognito Updates:	2016-05-17 18:10:07 -05:00