Sabe Jones 7e8f0d24c5 Merge remote-tracking branch 'origin/pr/6307' into develop ...

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

2016-01-11 13:48:01 -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

Add confirmation popover for Release pets/mounts

2015-12-28 21:37:38 -06:00

profiles

fix(strings): Make plural more greppable

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

tasks

Fixed task push text and move ctrlPressed logic to rootScope.

2015-11-28 12:06:34 -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

chore(news): Bailey 2016-01-08

2016-01-08 16:28:49 -05:00

noscript.jade

Adjust styling of noscript block

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