summary refs log tree commit diff
path: root/synapse/util/logformatter.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-07-17 15:06:41 +0200
committerBrendan Abolivier <babolivier@matrix.org>2019-07-17 15:06:41 +0200
commit28803ad56afed205a58f7f8ae1ce9e5d1eab10f5 (patch)
tree876cae312ee14843b8db08d1844924a86e088da6 /synapse/util/logformatter.py
parentChangelog (diff)
parentMerge pull request #5646 from matrix-org/babolivier/profile-allow-self (diff)
downloadsynapse-28803ad56afed205a58f7f8ae1ce9e5d1eab10f5.tar.xz
Merge branch 'dinsic' into babolivier/3pid-invite
Diffstat (limited to 'synapse/util/logformatter.py')
0 files changed, 0 insertions, 0 deletions