summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-12-03 13:08:53 +0000
committerRichard van der Hoff <richard@matrix.org>2016-12-03 13:08:53 +0000
commit59984e9f5872348e709fd52a729084b722bf8828 (patch)
treeb79d0ef4b9f00385a442527eb098f1e9d7413dd4 /synapse/config
parentMerge pull request #1664 from kyrias/preview-url-resource-encoding (diff)
parentMerge pull request #1667 from matrix-org/rav/update_readme (diff)
downloadsynapse-59984e9f5872348e709fd52a729084b722bf8828.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions