Tyler Renelle 76565384d3 Merge branch 'classes' into develop ...

Conflicts:
	public/js/controllers/tasksCtrl.js
	views/shared/modals/settings.jade

2013-12-08 18:17:53 -07:00

..

lists.jade

classes: proper handling of items on class-switch, un-equipping items,

2013-12-06 15:41:58 -07:00

task.jade

Merge branch 'classes' into develop

2013-12-08 18:17:53 -07:00