Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
557ccc7ec0cfea41a8534a4e9f2fed6eff7d05bb
habitica/website/public/js/controllers
T
History
Blade Barringer 75c9b5a978 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js
2015-02-09 22:21:27 -06:00
..
authCtrl.js
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-02-09 22:21:27 -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