Sabe Jones beb86ea4bd Merge branch 'khipkin/party-badges' into develop ...

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

2016-03-15 14:57:38 -04:00

..

avatar

Added rebirthLevel var to remove need of extra translation string

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

header

Moved the Habitica Wiki link down to the bottom

2016-01-15 09:48:16 -08:00

modals

award party {up,on} achiev when party reaches {2,4} members

2016-03-08 20:55:18 -05:00

profiles

move party up/on achievs about beast/mount achievs on profile

2016-03-08 21:03:57 -05:00

tasks

remove instructions for Beeminder users to read a warning about deleting completed To-Dos (warning is no longer needed)

2016-01-31 18:25:37 +10:00

footer.jade

Merge branch 'develop' into static-page-merch

2016-01-06 22:38:19 +01: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

fix(news): Pfeffernusse typo

2016-03-10 16:59:39 -06:00

noscript.jade

Adjust styling of noscript block

2015-11-17 21:35:07 -06:00