diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-30 17:55:06 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-30 17:55:06 +0100 |
| commit | 9605593d11b67199a98ed25f121a2af2e1c9587a (patch) | |
| tree | dc57897bfcbd1591fa0dfb219e376353584654e9 /docs/client-server/model/presence.rst | |
| parent | SYN-75 Verify signatures on server to server transactions (diff) | |
| parent | pyflakes cleanup (diff) | |
| download | synapse-9605593d11b67199a98ed25f121a2af2e1c9587a.tar.xz | |
Merge branch 'develop' into server2server_signing
Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py
Diffstat (limited to 'docs/client-server/model/presence.rst')
0 files changed, 0 insertions, 0 deletions