summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-10-09 20:02:30 +0100
committerMark Haines <mark.haines@matrix.org>2015-10-09 20:02:30 +0100
commit1a46daf621097d509207a29f6c2cb1152e494340 (patch)
tree9290dee5ebd1705369a89f4ba2216bd7f1b6c51c /synapse/push
parentSet the user as online if they start polling the v2 sync (diff)
parentFix some races in the synapse presence handler caused by not yielding on defe... (diff)
downloadsynapse-1a46daf621097d509207a29f6c2cb1152e494340.tar.xz
Merge branch 'markjh/presence_races' into markjh/v2_sync_api
Diffstat (limited to 'synapse/push')
0 files changed, 0 insertions, 0 deletions