Blade Barringer fc4e43bef8 Merge branch '4401_multiple_buy_gems_popups_with_mixins' of https://github.com/lucymhdavies/habitrpg into gems-mixin ...

Conflicts:
	views/shared/gems.jade
	views/shared/modals/buy-gems.jade

2015-01-01 23:18:28 -06:00

..

header

Merge pull request #4383 from SabreCat/seasonal

2014-12-16 21:51:02 -06:00

modals

Merge branch 'lucymhdavies-4401_multiple_buy_gems_popups' into develop

2015-01-01 23:12:10 -06:00

profiles

fix(NYE): Correct achievement badge

2014-12-30 22:56:40 -06:00

tasks

Adjusted styles for snowball and spookDust so they would align like the coins

2014-12-31 09:31:56 -06:00

footer.jade

Merge branch 'Alys-communityGuidelines' into develop

2014-10-27 16:20:30 -06:00

formatting-help.jade

Replace hard coded strings for env.t on views/shared/ folder.

2013-12-31 00:15:53 -02:00

gems.jade

Move views/shared/gems.jade -> views/shared/mixins.jade

2015-01-01 23:50:38 +00:00

mixins.jade

Add behaviour specific to the buy-gems popup.

2015-01-02 00:01:44 +00:00

new-stuff.jade

fix(NYE): fix cards

2014-12-30 23:25:34 -06:00