Sabe Jones 83b61f9aa3 Merge branch 'develop' into sabrecat/pet-201511 ...

Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.css
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.css
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.css
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.css
	common/dist/sprites/spritesmith-main-9.png

2015-11-11 18:36:25 -05:00

..

avatar

Added rebirthLevel var to remove need of extra translation string

2015-10-28 14:33:45 -04:30

header

Changed overview link

2015-11-03 22:56:47 -04:30

modals

fix(sharing): Translatable share strings

2015-11-11 13:35:14 -05:00

profiles

Merge pull request #6068 from AminArria/Wrong-max-level-messages

2015-10-30 23:21:29 -05:00

tasks

Toggle chevron direction

2015-10-05 22:17:28 +02:00

footer.jade

Merge branch 'develop' into sabrecat/more-modals

2015-11-09 16:24:17 -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

Add one time binding

2015-08-17 22:07:09 -05:00

new-stuff.jade

chore(news): Pet quest Bailey

2015-11-11 18:31:22 -05:00