diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-01-10 12:58:33 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-01-10 12:58:33 +0000 |
| commit | aa70d2412570d6d810fe8c0a625a41584c99b7d2 (patch) | |
| tree | f3c8f54409fe6ecd3a6cb25a9f1a8aeeaf84596f /synapse/config/appservice.py | |
| parent | Clarify that py2 packages will continue to exist (diff) | |
| parent | Fix macaroon_secret_key fallback logic (diff) | |
| download | synapse-aa70d2412570d6d810fe8c0a625a41584c99b7d2.tar.xz | |
Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions