Merge remote-tracking branch 'upstream/master' into facebook_login

2016-02-02 17:57:17 -05:00
parent 6546610567 f82122f4a1
commit 54e8285577
9 changed files with 35 additions and 12 deletions
--- a/users.js
+++ b/users.js
@@ -73,7 +73,7 @@ function handleLogIn(req) {
          'authProvider': 'password'
        },
        restricted: false,
-        expiresAt: Parse._encode(expiresAt).iso
+        expiresAt: Parse._encode(expiresAt)
      };
      
      if (req.info.installationId) {