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

..

community-guidelines-images

Adding Beffymaroo to moderators

2015-05-27 01:25:40 +02:00

css

Merge branch 'develop' into sabrecat/death-modal

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

emails/images

add image for bulk email

2015-06-11 22:17:34 +02:00

fontello

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

front

Remove unused html files

2015-06-13 15:18:04 -05:00

js

Merge branch 'develop' into analytics-service-server-side

2015-07-24 15:19:31 -05:00

logo

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

marketing

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

presskit

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

500.html

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

apple-touch-icon-57-precomposed.png

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

apple-touch-icon-72-precomposed.png

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

apple-touch-icon-114-precomposed.png

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

apple-touch-icon-144-precomposed.png

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

apple-touch-icon-precomposed.png

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

cake.png

Refine markdown help

2015-05-24 22:45:09 -05:00

favicon.ico

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

google8ca65b6ff3506fb8.html

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

google280633b772b94345.html

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

googlef3b1402b0e28338a.html

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

manifest.json

Fix member modal on static/front

2015-07-18 16:00:09 -05:00

page-loader.gif

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00

refresh.png

Started moving public folder stuff back to website

2015-02-03 14:02:34 -06:00