summary refs log tree commit diff
path: root/synapse/http/endpoint.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-04-09 16:11:43 +0100
committerErik Johnston <erik@matrix.org>2018-04-09 16:11:43 +0100
commit72c673407f521bbfad303f0f7e05446a23eedb24 (patch)
tree0a3077d57ae84c29aae110f7393b8581c28f26ad /synapse/http/endpoint.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentRevert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics" (diff)
downloadsynapse-72c673407f521bbfad303f0f7e05446a23eedb24.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/http/endpoint.py')
0 files changed, 0 insertions, 0 deletions