diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-05 15:35:05 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-05 15:35:05 +0000 |
commit | 7a5ea067e2e5470f6d1e0205a740fd9ea389531c (patch) | |
tree | ce8db7f95fd245afbb99e1dfecf9dbeaf6db0b30 /synapse/rest/client/v1/presence.py | |
parent | Merge pull request #341 from matrix-org/markjh/v2_sync_receipts (diff) | |
parent | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into release-... (diff) | |
download | synapse-7a5ea067e2e5470f6d1e0205a740fd9ea389531c.tar.xz |
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/rest/client/v1/presence.py')
0 files changed, 0 insertions, 0 deletions