summary refs log tree commit diff
path: root/synapse/crypto/context_factory.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-09-16 08:21:05 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-09-16 08:21:05 -0400
commitbbb7ca1f157f43250a2373b194c7dee3dfbfca80 (patch)
tree50556bab7c122e4f42ba8ac13534c90849273c91 /synapse/crypto/context_factory.py
parentMerge remote-tracking branch 'origin/release-v1.20.0' into matrix-org-hotfixes (diff)
parentMerge branch 'erikj/fix_origin_check' into release-v1.19.2 (diff)
downloadsynapse-bbb7ca1f157f43250a2373b194c7dee3dfbfca80.tar.xz
Merge remote-tracking branch 'origin/release-v1.19.2' into matrix-org-hotfixes
Diffstat (limited to 'synapse/crypto/context_factory.py')
0 files changed, 0 insertions, 0 deletions