summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-09 09:13:16 +0000
committerErik Johnston <erik@matrix.org>2019-01-09 09:13:16 +0000
commit7fafa2d95493dd6b62770f54efb16b223f2eb71d (patch)
tree0e756ac6e19c0364926ed51a886d4e7e24485f11 /synapse/python_dependencies.py
parentMerge tag 'v0.34.1rc1' into matrix-org-hotfixes (diff)
parentMerge pull request #4362 from matrix-org/erikj/better_errors (diff)
downloadsynapse-7fafa2d95493dd6b62770f54efb16b223f2eb71d.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