diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-09-18 19:02:45 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-09-18 19:02:45 +0100 |
| commit | 38ead946a9571f1916228c3d96aad48b6b57ef89 (patch) | |
| tree | cdc68014a0368b266796c83f78b9a02e41c0fe07 /synapse/config/key.py | |
| parent | towncrier (diff) | |
| parent | Merge pull request #3879 from matrix-org/matthew/fix-autojoin (diff) | |
| download | synapse-38ead946a9571f1916228c3d96aad48b6b57ef89.tar.xz | |
Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail_links
Diffstat (limited to 'synapse/config/key.py')
0 files changed, 0 insertions, 0 deletions