Sabe Jones 95ee19b4ca Merge branch 'taldin/faq-wiki-links' into develop ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css

2016-01-19 13:50:35 -05: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

Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks

2016-01-18 15:25:58 -06:00

profiles

fix(strings): Make plural more greppable

2015-11-16 17:08:38 -05:00

tasks

Align progress and help icons on to-dos column

2016-01-14 20:24:09 -06: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

feat(quests): January 2016 pet

2016-01-13 17:15:02 -05:00

noscript.jade

Adjust styling of noscript block

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