summary refs log tree commit diff
path: root/docker/conf
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-04 14:00:27 +0100
committerErik Johnston <erik@matrix.org>2019-07-04 14:00:27 +0100
commit822a0f0435994d52e2f5fe25f7fa6f8d62cdbb2f (patch)
treec59a72ef7e7a6fddeb03f123d4559ac23c706f1c /docker/conf
parentMove logging utilities out of the side drawer of util/ and into logging/ (#5606) (diff)
parentUpdate changelog (diff)
downloadsynapse-822a0f0435994d52e2f5fe25f7fa6f8d62cdbb2f.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'docker/conf')
0 files changed, 0 insertions, 0 deletions