summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-04-25 17:54:12 +0100
committerGitHub <noreply@github.com>2018-04-25 17:54:12 +0100
commita5ad88913c55ac5e42b38d9a40c5c25a7280510d (patch)
tree8e2a21e7c8bac1cdd67fdbe8abc09e3e85315535 /synapse/app
parentMerge branch 'master' into develop (diff)
parentAlso fix reindexing of search (diff)
downloadsynapse-a5ad88913c55ac5e42b38d9a40c5c25a7280510d.tar.xz
Merge pull request #3130 from matrix-org/erikj/fix_quarantine_room
Fix quarantine media admin API
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions