Sabe Jones 9e45017faa Merge branch 'develop' into sabrecat/onboarding-tweaks ...

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-08-28 13:24:10 -05:00

..

avatar

fix(sharing): Localize Tweet text

2015-08-04 14:55:15 -05:00

header

Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away

2015-08-22 17:03:26 -05:00

modals

feat(tutorial): Splash screen overhaul complete

2015-08-28 13:58:30 -04:00

profiles

changed habitrpg.wikia.com to habitica.wikia.com

2015-08-23 12:31:10 +10:00

tasks

feat(tutorial): Splash screen overhaul complete

2015-08-28 13:58:30 -04: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

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

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

new-stuff.jade

chore(news): Back to School Bailey

2015-08-27 16:20:15 -05:00