diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-10 11:04:37 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-10 11:04:37 +0000 |
| commit | c86ebe76736a4cde48cfb3229d894a174c6bd379 (patch) | |
| tree | afc236e8ef1bdbd6d0686747b99743661522638e /scripts/sphinx_api_docs.sh | |
| parent | Oops, we do want to defer.return regardless of whether we are caching or not (diff) | |
| parent | Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-c86ebe76736a4cde48cfb3229d894a174c6bd379.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Conflicts: synapse/app/homeserver.py synapse/state.py
Diffstat (limited to 'scripts/sphinx_api_docs.sh')
0 files changed, 0 insertions, 0 deletions