diff options
author | Erik Johnston <erik@matrix.org> | 2019-12-13 10:55:47 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-12-13 10:55:47 +0000 |
commit | f46e05d0537e79e2811522fad5021a20f41fd733 (patch) | |
tree | 8e64bd77b9771d32c594470cbab9225b74701f09 /synapse/logging/_terse_json.py | |
parent | Adjust the sytest blacklist for worker mode (#6538) (diff) | |
parent | Merge tag 'v1.7.0' (diff) | |
download | synapse-f46e05d0537e79e2811522fad5021a20f41fd733.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/logging/_terse_json.py')
0 files changed, 0 insertions, 0 deletions