summary refs log tree commit diff
path: root/synapse/storage/presence.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-27 16:40:11 +0000
committerErik Johnston <erik@matrix.org>2017-02-27 16:40:11 +0000
commit8a6196c6c85a0d5aa716749b98d55b74c4435d76 (patch)
treee974ec6975011b6beec4f1b636aa7fc826af4c0c /synapse/storage/presence.py
parentLocal changes (diff)
parentMerge pull request #1954 from matrix-org/erikj/cache_device2 (diff)
downloadsynapse-2017-02-27.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes 2017-02-27
Diffstat (limited to 'synapse/storage/presence.py')
0 files changed, 0 insertions, 0 deletions