Sabe Jones fc46023561 feat(armoire): October content ...

(cherry picked from commit 2b2a85838dbc4539d41e6e2d508374b0960238d6)

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith-main-3.png
	common/dist/sprites/spritesmith-main-4.css
	common/dist/sprites/spritesmith-main-4.png
	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-10-01 14:21:01 -05:00

..

achievements

WIP(greeting-cards): Abandon spell refactor

2015-08-13 14:31:34 -05:00

backgrounds

chore(content): Compile sprites

2015-08-31 15:54:08 -05:00

customize

feat(events): Limited edition

2015-06-25 11:19:01 -05:00

gear

feat(armoire): October content

2015-10-01 14:21:01 -05:00

misc

Move larger sprites to separate folder

2015-09-12 11:09:08 -05:00

npcs

feat(event): Fall 2015 sprites

2015-09-18 12:42:55 -05:00

quests

fix(sprite): clean up horse

2015-09-24 15:52:41 -05:00

shop

Resize sea foam image

2015-07-15 07:53:12 -05:00

stable

feat(pets): Spooky sprites

2015-09-22 12:45:59 -04:00