diff options
| author | David Baker <dave@matrix.org> | 2014-12-18 15:15:22 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2014-12-18 15:15:22 +0000 |
| commit | b56730bb6e549e6b22c95858cae50e091de96844 (patch) | |
| tree | 0eb011bc6b32a44df8c343ffedbc15e2ddd046e9 /docs/sphinx/synapse.federation.rst | |
| parent | schema version is now 10 (diff) | |
| parent | Update README.rst (diff) | |
| download | synapse-b56730bb6e549e6b22c95858cae50e091de96844.tar.xz | |
Merge branch 'develop' into pushers
Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py
Diffstat (limited to 'docs/sphinx/synapse.federation.rst')
0 files changed, 0 insertions, 0 deletions