diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-27 11:58:32 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-27 11:58:32 +0000 |
| commit | ad9226eeec87f1e5e3886c4dd599f89e7577d5a5 (patch) | |
| tree | 602250011e5528be426aa8965164e707ea978cbc /synapse/rest | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into federation_autho... (diff) | |
| parent | fix pyflakes warnings (diff) | |
| download | synapse-ad9226eeec87f1e5e3886c4dd599f89e7577d5a5.tar.xz | |
Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization
Conflicts: synapse/storage/__init__.py
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index a01dab1b8e..c72bdc2c34 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -344,7 +344,7 @@ class RoomInitialSyncRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id): - user = yield self.auth.get_user_by_req(request) + yield self.auth.get_user_by_req(request) # TODO: Get all the initial sync data for this room and return in the # same format as initial sync, that is: # { |