summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-05-22 17:59:43 +0100
committerNeil Johnson <neil@matrix.org>2019-05-22 17:59:43 +0100
commit73f1de31d107187949203ec8e3b3f248170b6316 (patch)
tree4d776766aa7e8122610725a20c1844df2860fd55 /synapse/crypto
parentremove urllib3 pin (#5230) (diff)
parent0.99.5.1 (diff)
downloadsynapse-73f1de31d107187949203ec8e3b3f248170b6316.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/crypto')
0 files changed, 0 insertions, 0 deletions