Sabe Jones e9547a6c7f Merge branch 'HEAD' of https://github.com/HabitRPG/habitrpg-shared into develop ... Conflicts: dist/customizer.css dist/habitrpg-shared.css dist/spritesmith.css img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Base.png img/sprites/spritesmith/mounts/Mount_Body_Gryphon-CottonCandyBlue.png img/sprites/spritesmith/mounts/Mount_Body_Gryphon-CottonCandyPink.png img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Desert.png img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Golden.png img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Red.png img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Shade.png img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Skeleton.png img/sprites/spritesmith/mounts/Mount_Body_Gryphon-White.png img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Zombie.png img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Base.png img/sprites/spritesmith/mounts/Mount_Head_Gryphon-CottonCandyBlue.png img/sprites/spritesmith/mounts/Mount_Head_Gryphon-CottonCandyPink.png img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Desert.png img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Golden.png img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Red.png img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Shade.png img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Skeleton.png img/sprites/spritesmith/mounts/Mount_Head_Gryphon-White.png img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Zombie.png		2014-01-26 20:01:29 -08:00
..
customizer.css	fix(mounts): Reposition gryphons, one more time	2014-01-26 19:55:41 -08:00
habitrpg-shared.css	fix(mounts): Reposition gryphons, one more time	2014-01-26 19:55:41 -08:00
habitrpg-shared.js	fix(beastmaster): allow hatching pets when petOwned<=0 (fyi	2014-01-26 17:47:27 -08:00
spritesmith-1390779418864.png	fix(mounts): Offset gryphons by 5x, 5y	2014-01-26 15:43:28 -08:00
spritesmith-1390794576317.png	fix(mounts): Reposition gryphons, one more time	2014-01-26 19:55:41 -08:00
spritesmith.css	fix(mounts): Reposition gryphons, one more time	2014-01-26 19:55:41 -08:00