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

2016-09-21 14:37:57 +02:00
parent 12275cc174 d371297482
commit bde01c30ad
90 changed files with 5455 additions and 4962 deletions
@@ -155,6 +155,7 @@ api.registerLocal = {
        gaLabel: 'local',
        uuid: savedUser._id,
        headers: req.headers,
+        user: savedUser,
      });
    }