Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synapse into anoa/full_search_upgraded_rooms

This commit is contained in:
Andrew Morgan 2019-01-24 17:23:51 +00:00
commit a383289b0d
3 changed files with 3 additions and 3 deletions

View file

@ -446,7 +446,7 @@ class StateGroupWorkerStore(EventsWorkerStore, SQLBaseStore):
room_id (str)
Returns:
Deferred[str]: predecessor room id
Deferred[unicode|None]: predecessor room id
"""
state_ids = yield self.get_current_state_ids(room_id)
create_id = state_ids.get((EventTypes.Create, ""))