summary refs log tree commit diff
path: root/docker/conf
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-29 15:51:12 +0000
committerErik Johnston <erik@matrix.org>2019-10-29 15:51:12 +0000
commit307e313ef4704ab3c8aeccad9e37f0f62fb89862 (patch)
treee16830e7325dc2d71029020e9b51cfce3af3de2f /docker/conf
parentNewsfile (diff)
parentFix CI for synapse_port_db (#6276) (diff)
downloadsynapse-307e313ef4704ab3c8aeccad9e37f0f62fb89862.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_events
Diffstat (limited to 'docker/conf')
0 files changed, 0 insertions, 0 deletions