Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
9bf1ebdb0faee3f46ef8ed3f7ed2eca72bf06be1
habitica/common/img/sprites
T
History
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
..
archive
Mv images to correct place
2015-02-12 13:44:28 -06:00
backer-only
Mv images to correct place
2015-02-12 13:44:28 -06:00
pet-hatching
Mv images to correct place
2015-02-12 13:44:28 -06:00
spritesmith
Merge branch 'develop' into sabrecat/pet-201511
2015-11-11 18:36:25 -05:00
spritesmith_large
Merge branch 'develop' into sabrecat/more-modals
2015-11-09 16:24:17 -05:00
npc_ian.gif
Mv images to correct place
2015-02-12 13:44:28 -06:00
quest_burnout.gif
WIP(world-boss): Initial stats outlay
2015-10-05 16:59:19 -04:00