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

..

lists.jade

fix final bit of conflict

2015-01-11 14:54:41 +10:00

task.jade

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

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