benmanley f93e0ba6b9 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop ...

Conflicts:
	views/shared/tasks/task.jade

2015-01-19 17:06:19 +00:00

..

header

revert part of a053486, angular is madeningly inconsistent with this bug

2015-01-18 16:38:31 -07:00

modals

Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat

2015-01-09 13:51:21 -06:00

profiles

fix(world-boss): Achievement badge

2015-01-08 15:47:48 -06:00

tasks

Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop

2015-01-19 17:06:19 +00: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

mixins.jade

Add behaviour specific to the buy-gems popup.

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

new-stuff.jade

feat(quest): T-Rex pet

2015-01-15 15:38:51 -06:00