Shaun Bennett 23232efd63 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java # Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java		2016-04-05 13:04:39 +10:00
..
src/mineplex/bungee	Merge remote-tracking branch 'remotes/origin/develop' into clans/beta	2016-04-05 13:04:39 +10:00
plugin.yml	Added in dynamic servermanager updating.	2013-09-11 13:53:24 -07:00
pom.xml	Fix sentry	2016-02-19 19:44:36 +11:00