summary refs log tree commit diff
path: root/synapse/app/frontend_proxy.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-06-25 20:14:34 +0100
committerErik Johnston <erik@matrix.org>2018-06-25 20:14:34 +0100
commitd46450195b7f9e3b7732f4497160df6a9106931f (patch)
treeeddd8318104a2b503ea4cf0b44d1b2bb14d71796 /synapse/app/frontend_proxy.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3442 from matrix-org/matthew/allow-unconsented-parts (diff)
downloadsynapse-d46450195b7f9e3b7732f4497160df6a9106931f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/frontend_proxy.py')
0 files changed, 0 insertions, 0 deletions