diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-03 18:25:17 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-03 18:25:17 +0100 |
| commit | d72ce4da64416eb10224e6a6b55aecdd27967b6b (patch) | |
| tree | ec86c93b1ebaf0ebb11f9e9d2a5377f608ab98b2 /sphinx_api_docs.sh | |
| parent | Make registering and logging in with a threepid work in the webclient. (diff) | |
| parent | Fix ban path (diff) | |
| download | synapse-d72ce4da64416eb10224e6a6b55aecdd27967b6b.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts: synapse/http/client.py
Diffstat (limited to 'sphinx_api_docs.sh')
0 files changed, 0 insertions, 0 deletions