summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-06 12:50:28 +0100
committerErik Johnston <erik@matrix.org>2019-09-06 12:50:28 +0100
commit39883e85bd2ada6fcf2b56be5bf395649f83c09f (patch)
treee55aed646a9347e01f581adde9c8e74f0b22ade7 /synapse/python_dependencies.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #5991 from matrix-org/erikj/fix_tracing_funcs (diff)
downloadsynapse-39883e85bd2ada6fcf2b56be5bf395649f83c09f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/python_dependencies.py')
0 files changed, 0 insertions, 0 deletions