habitica/website/views
Sabe Jones eed4207c6d Merge branch 'develop' into sabrecat/more-modals
Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json
2015-11-09 16:24:17 -05:00
..
main Adjust PR #5389 2015-06-12 09:05:06 -05:00
options Merge branch 'develop' into sabrecat/more-modals 2015-11-09 16:24:17 -05:00
shared Merge branch 'develop' into sabrecat/more-modals 2015-11-09 16:24:17 -05:00
social feat(sharing): Streak Achievement 2015-11-06 16:54:23 -05:00
static Merge branch 'develop' into sabrecat/more-modals 2015-11-09 16:24:17 -05:00
avatar-static.jade add TODO comments, send mods to client as they are used there 2015-08-14 21:05:04 +02:00
index.jade use only client vars on index.jade 2015-08-14 20:58:57 +02:00