diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-11 16:04:51 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-11 16:04:51 +0000 |
| commit | 7e0a1683e639c18bd973f825b91c908966179c15 (patch) | |
| tree | 3baa10fc7a3c447e910a9d8f03fbdda238ab08dc /synapse | |
| parent | Merge branch 'release-v0.13.2' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-7e0a1683e639c18bd973f825b91c908966179c15.tar.xz | |
Merge branch 'release-v0.13.3' of github.com:matrix-org/synapse v0.13.3
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/stream.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 9c4213a4a9..bc50bec9db 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.13.2" +__version__ = "0.13.3" diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index 0d1034c6f1..c236dafafb 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -175,7 +175,7 @@ class StreamStore(SQLBaseStore): preserve_fn(self.get_room_events_stream_for_room)( room_id, from_key, to_key, limit, order=order, ) - for room_id in room_ids + for room_id in rm_ids ]) results.update(dict(zip(rm_ids, res))) |