diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-23 16:55:29 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-23 16:55:29 +0000 |
| commit | 7a3815b372552e516cc3619c4ea143f610358206 (patch) | |
| tree | 8ff286640cbc715ae82f7c13fcadfed218373070 /docs/sphinx/synapse.rest.room.rst | |
| parent | English (diff) | |
| parent | Merge pull request #666 from matrix-org/erikj/intern (diff) | |
| download | synapse-7a3815b372552e516cc3619c4ea143f610358206.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0
Diffstat (limited to 'docs/sphinx/synapse.rest.room.rst')
0 files changed, 0 insertions, 0 deletions