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

..

main

change markdown ngModel to text attribute

2015-01-01 20:57:57 +01:00

options

Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting

2015-01-18 23:08:40 -06:00

shared

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

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

static

refactor(services): move to a single "habitrpg" module for services /

2015-01-17 18:43:37 -07:00

avatar-static.jade

refactor(tasks) improve UI consistency

2014-11-27 10:32:57 +00:00

index.jade

Source the new mixin file, and call the mixins in place of including the former gems.jade

2015-01-01 23:58:28 +00:00