sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 00:09:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
habitica/website/views/shared
History
Blade Barringer cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
2015-02-03 21:13:55 -06:00
..
header Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-03 21:13:55 -06:00
modals Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-03 21:13:55 -06:00
profiles Moved folders to website directory 2015-02-03 14:10:55 -06:00
tasks Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-03 21:13:55 -06:00
footer.jade Moved folders to website directory 2015-02-03 14:10:55 -06:00
formatting-help.jade Moved folders to website directory 2015-02-03 14:10:55 -06:00
mixins.jade Moved folders to website directory 2015-02-03 14:10:55 -06:00
new-stuff.jade Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-03 21:13:55 -06:00