diff options
| author | David Baker <dave@matrix.org> | 2015-04-24 09:37:54 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-04-24 09:37:54 +0100 |
| commit | 6532b6e60776f2c732b06e5535af068e9a049d6d (patch) | |
| tree | 4bbfeddf91f35c0f3744b346f30d6e3813c22196 /scripts/sphinx_api_docs.sh | |
| parent | Dedicated error code for failed 3pid auth verification (diff) | |
| parent | No commas here, otherwise our error string constants become tuples. (diff) | |
| download | synapse-6532b6e60776f2c732b06e5535af068e9a049d6d.tar.xz | |
Merge branch 'develop' into csauth
Conflicts: synapse/http/server.py
Diffstat (limited to 'scripts/sphinx_api_docs.sh')
0 files changed, 0 insertions, 0 deletions