summary refs log tree commit diff
path: root/docker/conf
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-03 19:25:01 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-03 19:25:01 +0100
commit836d3adcce81bdafd8d9033df028485dcbb9d4ed (patch)
tree1f8485651a7d7dc88908ae8783125c1b4afbf17d /docker/conf
parentAdd admin api for sending server_notices (#5121) (diff)
parentMerge tag 'v0.99.3.2' (diff)
downloadsynapse-836d3adcce81bdafd8d9033df028485dcbb9d4ed.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'docker/conf')
0 files changed, 0 insertions, 0 deletions