diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-28 16:52:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-28 16:52:46 +0100 |
| commit | 54d0a755734f71e38c5cdc0e922422cc4d31ad74 (patch) | |
| tree | 4d0256be69f304553d0efaa71ec50498f3821683 /sphinx_api_docs.sh | |
| parent | Up timeout to 10 minutes (diff) | |
| parent | Only send presence "poll"/"unpoll" EDUs when changing from/to zero remotes (diff) | |
| download | synapse-54d0a755734f71e38c5cdc0e922422cc4d31ad74.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging
Conflicts: synapse/handlers/presence.py
Diffstat (limited to 'sphinx_api_docs.sh')
0 files changed, 0 insertions, 0 deletions