summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-04-26 15:44:54 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-04-26 15:44:54 +0100
commit872158030301410016ec9d9236e89e484aa3fe73 (patch)
treecf9c4fffacb23511c27513a1f9e5c5e1e0e18a4a /synapse/handlers
parentUpdate CHANGES.rst (diff)
parentMerge pull request #3134 from matrix-org/erikj/fix_admin_media_api (diff)
downloadsynapse-872158030301410016ec9d9236e89e484aa3fe73.tar.xz
Merge branch 'develop' of https://github.com/matrix-org/synapse into release-v0.28.0-rc1
Diffstat (limited to 'synapse/handlers')
0 files changed, 0 insertions, 0 deletions