summary refs log tree commit diff
path: root/synapse/logging/context.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-30 13:26:19 +0100
committerErik Johnston <erik@matrix.org>2019-07-30 13:26:19 +0100
commit9b2b386f76394fdf321769ccc472dda36f46a2c3 (patch)
treef953527efc90baf3913c493550991636f91242dd /synapse/logging/context.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #5789 from matrix-org/erikj/fix_error_handling_keys (diff)
downloadsynapse-9b2b386f76394fdf321769ccc472dda36f46a2c3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/logging/context.py')
0 files changed, 0 insertions, 0 deletions