diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-05-03 19:25:01 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-05-03 19:25:01 +0100 |
commit | 836d3adcce81bdafd8d9033df028485dcbb9d4ed (patch) | |
tree | 1f8485651a7d7dc88908ae8783125c1b4afbf17d /docker/conf | |
parent | Add admin api for sending server_notices (#5121) (diff) | |
parent | Merge tag 'v0.99.3.2' (diff) | |
download | synapse-836d3adcce81bdafd8d9033df028485dcbb9d4ed.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'docker/conf')
0 files changed, 0 insertions, 0 deletions