Merge in auth changes from develop

This commit is contained in:
Mark Haines 2015-01-29 15:54:54 +00:00
parent 9d8f798a3f
commit 33391db5f8
2 changed files with 3 additions and 2 deletions

View file

@ -51,6 +51,7 @@ class V2AlphaRestTestCase(unittest.TestCase):
"user": UserID.from_string(self.USER_ID),
"admin": False,
"device_id": None,
"token_id": 1,
}
hs.get_auth().get_user_by_token = _get_user_by_token