summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-01-24 17:23:51 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-01-24 17:23:51 +0000
commita383289b0d64a5efa74c5d597f9e2c14732cd224 (patch)
treec314d5c316d2f5a56ac59342963f8d1cfbed2597 /synapse/handlers
parentRemove redundant create event None check (diff)
parentApply suggestions from code review (diff)
downloadsynapse-a383289b0d64a5efa74c5d597f9e2c14732cd224.tar.xz
Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synapse into anoa/full_search_upgraded_rooms
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/search.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py
index 75c26fe065..49c439313e 100644
--- a/synapse/handlers/search.py
+++ b/synapse/handlers/search.py
@@ -52,7 +52,7 @@ class SearchHandler(BaseHandler):
             room_id (str): id of the room to search through.
 
         Returns:
-            Deferred[iterable[str]]: predecessor room ids
+            Deferred[iterable[unicode]]: predecessor room ids
         """
 
         historical_room_ids = []