diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-09-24 17:05:15 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-09-24 17:05:15 +0100 |
commit | a7af389da081214eefb5c570d4093827c8fcfc67 (patch) | |
tree | f338c088c5046670cf7c19d2d94c0f8f6a8468f3 /synapse/python_dependencies.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #6037 from matrix-org/rav/saml_mapping_work (diff) | |
download | synapse-a7af389da081214eefb5c570d4093827c8fcfc67.tar.xz |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/python_dependencies.py')
0 files changed, 0 insertions, 0 deletions