summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-30 17:04:08 +0000
committerErik Johnston <erik@matrix.org>2019-01-30 17:04:08 +0000
commit62962e30e48c10cbbe4f52a2866c97c4845c0abb (patch)
tree573aac67b1fc9c7cdc8e1bb3dc51e1136ea2c549 /synapse/python_dependencies.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge remote-tracking branch 'origin/release-v0.99.0' into develop (diff)
downloadsynapse-62962e30e48c10cbbe4f52a2866c97c4845c0abb.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