Shaun Bennett 0f83263871 Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java		2016-01-19 11:01:11 -05:00
..
.settings	Remove project specific settings	2015-12-13 16:41:37 +13:00
src	Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial	2016-01-19 11:01:11 -05:00
.classpath	Treasure changes :O	2015-02-09 20:24:20 +13:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Core.Common.iml	Update IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00