summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-02 15:38:54 +0100
committerErik Johnston <erik@matrix.org>2019-10-02 15:38:54 +0100
commit5b9e5c27d81e90b8fa76be01872eb4d5050d3f69 (patch)
treef7e8d6e4215c0825200ff752069bea46a183815b /synapse
parentNewsfile (diff)
parentMerge pull request #6152 from matrix-org/erikj/fix_room_list (diff)
downloadsynapse-5b9e5c27d81e90b8fa76be01872eb4d5050d3f69.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_room_list_non_federatable
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions