summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-09-14 19:56:33 +0100
committerErik Johnston <erik@matrix.org>2018-09-14 19:56:33 +0100
commit2da2041e2e2af5663633f6937eccef4dff7608c1 (patch)
tree9a6592b30a2d6ebd19d3f88a19a0ab80ecd9e09c /synapse/python_dependencies.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3875 from matrix-org/erikj/extra_timeouts (diff)
downloadsynapse-2da2041e2e2af5663633f6937eccef4dff7608c1.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