summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-10-18 12:35:13 +0100
committerRichard van der Hoff <richard@matrix.org>2019-10-18 12:35:13 +0100
commit2b22faded76d8813d1145ac673eca16e9787f6ce (patch)
treee33a517f865be8f2113ddfead3f24c6b83faef4a /demo
parentMerge remote-tracking branch 'origin/develop' into rav/event_auth/1 (diff)
parentFix logging config for the docker image (#6197) (diff)
downloadsynapse-2b22faded76d8813d1145ac673eca16e9787f6ce.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/event_auth/1
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions