diff options
| author | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
| commit | d8a6c734fa1ab6681431c43885ced627e5e672e0 (patch) | |
| tree | 4ba6a510997e38e829c6a6b0aa53caace4e7b872 /synapse/handlers/presence.py | |
| parent | Copy dict in update_membership too (diff) | |
| parent | Merge pull request #2723 from matrix-org/matthew/search-all-local-users (diff) | |
| download | synapse-d8a6c734fa1ab6681431c43885ced627e5e672e0.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom_content
Diffstat (limited to 'synapse/handlers/presence.py')
| -rw-r--r-- | synapse/handlers/presence.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index fa96ea69cd..cb158ba962 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -1199,7 +1199,7 @@ def handle_timeout(state, is_mine, syncing_user_ids, now): ) changed = True else: - # We expect to be poked occaisonally by the other side. + # We expect to be poked occasionally by the other side. # This is to protect against forgetful/buggy servers, so that # no one gets stuck online forever. if now - state.last_federation_update_ts > FEDERATION_TIMEOUT: |