diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-01-10 14:12:50 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-01-10 14:12:50 +0000 |
| commit | e0910d01450fea79fc34f1882c293b026e2bd717 (patch) | |
| tree | 33ea25377ca99c0eff44123d9539531d7ae8fd14 /synapse/util/jsonobject.py | |
| parent | fix docker build to install optional deps (diff) | |
| parent | Revert "Fix macaroon_secret_key fallback logic" (diff) | |
| download | synapse-e0910d01450fea79fc34f1882c293b026e2bd717.tar.xz | |
Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1
Fixes #4371
Diffstat (limited to 'synapse/util/jsonobject.py')
0 files changed, 0 insertions, 0 deletions