Sabe Jones 41b4d497f7 Merge branch 'develop' into sabrecat/pet-201509 ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png

2015-09-08 13:25:10 -05:00

..

drops.jade

feat(quests): Horse quest

2015-09-01 13:26:41 -04:00

equipment.jade

Adjust spacing

2015-07-14 19:32:45 -05:00

index.jade

Merge branch 'develop' into quests-fix-merge-coflicts

2015-07-13 08:20:52 -05:00

menu.jade

Sort out conflicts from develop

2015-07-12 13:51:42 -05:00

mounts.jade

Reconstructing pets and mounts progress strings

2015-08-13 20:39:23 +05:00

pets.jade

Update habitrpg.com to habitica.com where applicable

2015-08-19 08:00:34 -05:00

quests.jade

Move ian inside quest scrolls div

2015-08-22 15:43:35 -05:00

seasonal-shop.jade

chore(news): End Summer Splash

2015-08-02 14:09:26 -05:00

time-travelers.jade

Update habitrpg.com to habitica.com where applicable

2015-08-19 08:00:34 -05:00