Alys 8d106d6d78 Merge branch 'fix_gryphons' of https://github.com/taldin/habitrpg into taldin-fix_gryphons ...

Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png

2016-02-18 18:56:40 +10:00

..

achievements

feat(event): Habit Birthday 2016

2016-01-28 17:16:01 -05:00

backgrounds

feat(content): BGs and Armoire 201602

2016-02-02 16:02:50 -05:00

customize

chore(news): Bailey 2016-01-08

2016-01-08 16:28:49 -05:00

gear

feat(content): BGs and Armoire 201602

2016-02-02 16:02:50 -05:00

misc

feat(event): Habit Birthday 2016

2016-01-28 17:16:01 -05:00

npcs

chore(event): revert Valentine's

2016-02-15 14:48:39 -05:00

quests

feat(quests): pets 201602

2016-02-08 16:20:05 -05:00

shop

Resize sea foam image

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

stable

Fixes #6356 (gryphon avatar clipping)

2016-02-09 10:27:10 -08:00