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

This commit is contained in:
Matteo Pagliazzi
2013-11-02 09:54:44 +01:00
2 changed files with 7 additions and 8 deletions

View File

@@ -230,4 +230,4 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
User.log({op:'set',data:{'flags.rest':User.user.flags.rest}});
}
}
])
])