summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-02 16:20:23 +0100
committerErik Johnston <erik@matrix.org>2017-10-02 16:20:23 +0100
commit90d70af269f930f7b76a612ea1946be1fc33a6db (patch)
treeacb44def7327c19932e1017ddd39ab067315c016 /synapse/python_dependencies.py
parentMerge pull request #2480 from matrix-org/rav/federation_client_logging (diff)
parentMerge branch 'release-v0.23.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-90d70af269f930f7b76a612ea1946be1fc33a6db.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/python_dependencies.py')
0 files changed, 0 insertions, 0 deletions