diff options
author | Erik Johnston <erik@matrix.org> | 2017-02-15 09:54:09 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-02-15 09:54:09 +0000 |
commit | 738000971ea27c2b300048130f74769ba0e24477 (patch) | |
tree | ca06e70bf3ec9b4c4bb04e9b2d99c16a9cbd610b /synapse/storage/presence.py | |
parent | Merge branch 'master' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #1912 from matrix-org/markjh/roominitialsync (diff) | |
download | synapse-738000971ea27c2b300048130f74769ba0e24477.tar.xz |
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/presence.py')
0 files changed, 0 insertions, 0 deletions