diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-11-14 11:54:29 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-11-14 11:54:29 +0000 |
commit | b699178aa153eb6285fa4c582f7d287ee23c8497 (patch) | |
tree | ac890bdd98c9f84b9e18ce26fcea4fccad7c562c /synapse/python_dependencies.py | |
parent | Merge remote-tracking branch 'origin/erikj/fix_device_comparison' into matrix... (diff) | |
parent | Merge pull request #4184 from matrix-org/rav/fix_public_consent (diff) | |
download | synapse-b699178aa153eb6285fa4c582f7d287ee23c8497.tar.xz |
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/python_dependencies.py')
0 files changed, 0 insertions, 0 deletions