summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-08-13 18:49:50 +0100
committerGitHub <noreply@github.com>2018-08-13 18:49:50 +0100
commitcd32c19a604549b4518d748c07149d140bc9e063 (patch)
treebb95bcef8f38a23f9b53f5e9707035c628229ab2 /synapse/crypto/keyring.py
parentMerge pull request #3677 from andrewshadura/master (diff)
parentRevert "Use recaptcha_ajax.js directly from Google" (diff)
downloadsynapse-cd32c19a604549b4518d748c07149d140bc9e063.tar.xz
Merge pull request #3685 from matrix-org/revert-3677-master
Revert "Use recaptcha_ajax.js directly from Google"
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions