diff options
author | Richard van der Hoff <richard@matrix.org> | 2016-12-03 13:08:53 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2016-12-03 13:08:53 +0000 |
commit | 59984e9f5872348e709fd52a729084b722bf8828 (patch) | |
tree | b79d0ef4b9f00385a442527eb098f1e9d7413dd4 /docs/README.rst | |
parent | Merge pull request #1664 from kyrias/preview-url-resource-encoding (diff) | |
parent | Merge pull request #1667 from matrix-org/rav/update_readme (diff) | |
download | synapse-59984e9f5872348e709fd52a729084b722bf8828.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docs/README.rst')
0 files changed, 0 insertions, 0 deletions