Sabe Jones d022a0eb67 Merge branch 'develop' into sabrecat/death-modal ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	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-07-24 16:11:51 -05:00

..

avatar

feat(event): Summer Splash cont'd

2015-07-01 13:11:53 -05:00

header

Remove close button from menu

2015-07-19 19:08:48 -05:00

modals

Merge branch 'develop' into sabrecat/death-modal

2015-07-24 16:11:51 -05:00

profiles

Use better beastMaster / mountMaster counts

2015-07-19 21:51:30 -05:00

tasks

Merge branch 'barbourkd-develop' into develop

2015-07-11 00:11:23 -05:00

footer.jade

Update iOS link to point to new app in footer

2015-07-07 21:30:08 -05: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

markdown preview - code "inherit white-space" / hide links for 'system'

2015-04-27 19:47:42 +02:00

new-stuff.jade

feat(mystery): July 2015 goodies

2015-07-23 12:05:13 -05:00