habitica/views/shared
Tyler Renelle 928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop
Conflicts:
	src/models/user.js
	views/shared/modals/index.jade
2013-12-31 08:04:51 -07:00
..
header Final commit for Rebirth feature! Implement achievement and prestige icon 2013-12-25 17:56:55 -06:00
modals Merge remote-tracking branch 'origin/sabe/rebirth' into develop 2013-12-31 08:04:51 -07:00
profiles Merge remote-tracking branch 'origin/sabe/rebirth' into develop 2013-12-31 08:04:51 -07:00
tasks Merge branch 'checklists' into develop 2013-12-31 07:53:34 -07:00
footer.jade Update Request Feature link 2013-12-27 19:21:30 -08:00
formatting-help.jade Change Markdown help link to point at HabitRPG wiki 2013-11-24 13:13:21 -06:00
gems.jade Merge branch 'classes' into develop 2013-12-08 18:17:53 -07:00