summary refs log tree commit diff
path: root/setup.cfg
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-24 11:46:09 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-24 11:46:09 +0100
commit30bfed5aa50317a7d05677c8de250d7d925938ac (patch)
tree256f995fef7eed858fff71920f706b866e7ac5e1 /setup.cfg
parentMerge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room (diff)
parentMerge pull request #3591 from matrix-org/rav/logcontext_fixes (diff)
downloadsynapse-30bfed5aa50317a7d05677c8de250d7d925938ac.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions