Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_room_list_non_federatable

pull/6153/head
Erik Johnston 2019-10-02 15:38:54 +01:00
commit 5b9e5c27d8

Diff Content Not Available