summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-09 16:52:08 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-09 16:52:08 +0000
commit8d4b4e781f6d4502795cdeb2d588f685c718697f (patch)
tree5ddd5f549be0a1916868078ba4c53fe2181a60fa /synapse/config
parentMerge branch 'master' into develop (diff)
parentfix docker build to install optional deps (diff)
downloadsynapse-8d4b4e781f6d4502795cdeb2d588f685c718697f.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions