Blade Barringer 7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat ...

Conflicts:
	views/options/social/chat-message.jade

2014-12-18 21:55:50 -06:00

..

challenge.js

fix(challenges): since we're setting {minimize:false} on tasks, don't

2014-10-03 14:34:58 -06:00

coupon.js

Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop

2014-11-29 08:33:28 -07:00

group.js

Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat

2014-12-18 21:55:50 -06:00

task.js

Revert "Revert "fix(tasks): tmp fix for #4066, minimize:false on tasks so they have""

2014-10-03 19:05:37 +02:00

user.js

feat(plans): consectuive-month subscription perks (gifting)

2014-12-03 14:17:07 -07:00