summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-11-03 18:45:13 +0000
committerMark Haines <mjark@negativecurvature.net>2015-11-03 18:45:13 +0000
commitf74f48e9e6a97441541e3babcae7ed5a1a0f4373 (patch)
tree1e57d4906f5544ad4483b23eae0a7f2b6a19c22e /synapse/app/homeserver.py
parentMerge pull request #343 from matrix-org/erikj/fix_retries (diff)
parentMerge branch 'develop' into markjh/v2_sync_receipts (diff)
downloadsynapse-f74f48e9e6a97441541e3babcae7ed5a1a0f4373.tar.xz
Merge pull request #341 from matrix-org/markjh/v2_sync_receipts
Include read receipts in v2 sync
Diffstat (limited to 'synapse/app/homeserver.py')
0 files changed, 0 insertions, 0 deletions