summary refs log tree commit diff
path: root/synapse/app/frontend_proxy.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-01-25 14:33:14 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-01-25 14:33:14 +0000
commit53d25116dff83e16264f1d50db59a29344f3de7a (patch)
tree818d7bf5b55309b4f213ba35bc028d8f42ddc241 /synapse/app/frontend_proxy.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #4471 from matrix-org/erikj/sqlite_native_upsert (diff)
downloadsynapse-53d25116dff83e16264f1d50db59a29344f3de7a.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