diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-02 17:21:17 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-02 17:21:17 +0000 |
| commit | c9f5af1de7b70a405ca1ee7ce301d59a51435b98 (patch) | |
| tree | 8f61c4d8866734cf344742612ecdad1d425ae362 /CHANGES.rst | |
| parent | Remove editor junk (diff) | |
| parent | SYN-187: Set a more sensible default for the content_addr (diff) | |
| download | synapse-c9f5af1de7b70a405ca1ee7ce301d59a51435b98.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'CHANGES.rst')
0 files changed, 0 insertions, 0 deletions