sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 07:21:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
habitica/common/img/sprites
History
Sabe Jones 0f31873262 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	website/views/options/social/index.jade
2015-08-14 11:23:35 -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/party-page 2015-08-14 11:23:35 -05:00
npc_ian.gif Mv images to correct place 2015-02-12 13:44:28 -06:00