diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-22 13:16:35 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-22 13:16:35 +0100 |
| commit | 8a98f0dc5b2dceba596f7d25895969a88c223053 (patch) | |
| tree | 9e62f8773a32fc24f1951a2601fee1f9afabc178 /static | |
| parent | PEP8 (diff) | |
| parent | Merge pull request #320 from matrix-org/appservice-retry-cap (diff) | |
| download | synapse-8a98f0dc5b2dceba596f7d25895969a88c223053.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions