diff options
| author | Neil Johnson <neil@matrix.org> | 2018-06-06 12:28:15 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-06-06 12:28:15 +0100 |
| commit | fef6c2cdcc529aa7f36fcb8ae28cb7e3b8f4af15 (patch) | |
| tree | 16ea9194a2b4447c4a4dda0e8f209ddcedf12dfd /synapse/crypto/keyring.py | |
| parent | Merge pull request #3349 from t3chguy/redact_as_request_token (diff) | |
| parent | Merge tag 'v0.31.0' (diff) | |
| download | synapse-fef6c2cdcc529aa7f36fcb8ae28cb7e3b8f4af15.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions