summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-11-14 11:54:29 +0000
committerRichard van der Hoff <richard@matrix.org>2018-11-14 11:54:29 +0000
commitb699178aa153eb6285fa4c582f7d287ee23c8497 (patch)
treeac890bdd98c9f84b9e18ce26fcea4fccad7c562c /synapse/python_dependencies.py
parentMerge remote-tracking branch 'origin/erikj/fix_device_comparison' into matrix... (diff)
parentMerge pull request #4184 from matrix-org/rav/fix_public_consent (diff)
downloadsynapse-b699178aa153eb6285fa4c582f7d287ee23c8497.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/python_dependencies.py')
0 files changed, 0 insertions, 0 deletions