diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-10-09 20:02:30 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-10-09 20:02:30 +0100 |
commit | 1a46daf621097d509207a29f6c2cb1152e494340 (patch) | |
tree | 9290dee5ebd1705369a89f4ba2216bd7f1b6c51c /synapse/push | |
parent | Set the user as online if they start polling the v2 sync (diff) | |
parent | Fix some races in the synapse presence handler caused by not yielding on defe... (diff) | |
download | synapse-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