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
..
index.jade	challenges: switch from ngRoute to ui-router	2013-10-28 11:34:08 -07:00
inventory.jade	Merge branch 'classes' into develop	2013-12-08 18:17:53 -07:00
stable.jade	classes: small bug fixes	2013-12-07 20:41:48 -07:00