habitica

Files

T

Sabe Jones 83b61f9aa3 Merge branch 'develop' into sabrecat/pet-201511

Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.css
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.css
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.css
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.css
	common/dist/sprites/spritesmith-main-9.png

2015-11-11 18:36:25 -05:00

content

feat(pets): November quest

2015-11-11 17:23:16 -05:00

public

revert a commit that went live prematurely when I was distracted - sorry for commit spam

2015-10-31 19:26:05 +09:00

src

fix(content): Correct stats for Royal Robes

2015-11-02 17:34:59 -05:00

count.js

Add coffeescript back in