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

..

avatar

Merge branch 'develop' into sabrecat/party-page

2015-08-05 12:43:56 -05:00

header

WIP(greeting-cards): Abandon spell refactor

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

modals

Merge branch 'develop' into sabrecat/party-page

2015-08-14 11:23:35 -05:00

profiles

WIP(greeting-cards): Abandon spell refactor

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

tasks

Fix bug where armoire notes would not display correctly

2015-08-14 06:59:23 -05:00

footer.jade

add'l link changes

2015-08-02 01:03:34 +00:00

formatting-help.jade

Removed colons from JSON and 'formatting-help' class to 'slight-vertical-padding'

2015-06-04 17:48:31 -04:00

mixins.jade

WIP(party-page): UI draft

2015-08-10 13:42:36 -05:00

new-stuff.jade

feat(greeting-cards): Thank-You & Greets

2015-08-13 16:58:31 -05:00