summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-11 10:55:16 +0000
committerErik Johnston <erik@matrix.org>2016-02-11 10:55:16 +0000
commit88a973cde5003c955a1e1b744b3b086867ee9cdf (patch)
treead628243c6c0414619116e50208bcc7d83c99102 /synapse/handlers/room.py
parent0.13.1 (diff)
parentBump version and changelog (diff)
downloadsynapse-88a973cde5003c955a1e1b744b3b086867ee9cdf.tar.xz
Merge branch 'release-v0.13.2' of github.com:matrix-org/synapse v0.13.2
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index a8e3a9029c..b2de2cd0c0 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -1061,6 +1061,7 @@ class RoomEventSource(object):
                 from_key=from_key,
                 to_key=to_key,
                 limit=limit or 10,
+                order='ASC',
             )
 
             events = list(room_events)