Blade Barringer dca2f13dda Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert ...

Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js

2015-02-05 11:20:40 -06:00

..

authCtrl.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

challengesCtrl.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

filtersCtrl.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

footerCtrl.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

groupsCtrl.js

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

2015-02-05 11:20:40 -06:00

hallCtrl.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

headerCtrl.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

inventoryCtrl.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

notificationCtrl.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

rootCtrl.js

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

2015-02-05 11:20:40 -06:00

settingsCtrl.js

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

2015-02-03 21:13:55 -06:00

tasksCtrl.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

userCtrl.js

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00