summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-04-11 11:13:32 +0100
committerErik Johnston <erik@matrix.org>2017-04-11 11:13:32 +0100
commitf3cf3ff8b687e3ed699c1862f4fbc8be1f866f79 (patch)
tree3abc25d85a4ad7b00bc632c4d7c6e695957ad305 /synapse/config
parenttrust a hypothetical future riot.im IS (diff)
parentMerge branch 'release-v0.20.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-f3cf3ff8b687e3ed699c1862f4fbc8be1f866f79.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions