Shaun Bennett d30fb8d8ef Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java		2016-01-29 03:40:28 -05:00
..
Class	outpost changes, and some other things	2016-01-06 22:32:36 +00:00
Condition	fixed silence not working in non-champs servers	2015-11-21 11:08:09 +11:00
event	made pvp timer players immune to skills	2015-12-15 21:12:49 +00:00
item	Merge with master, lots of clans fixes/work	2015-11-25 14:50:49 -05:00
shop	-B	2015-11-20 05:57:29 -05:00
Skill	Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha	2016-01-29 03:40:28 -05:00