summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-11-17 01:53:50 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-11-17 01:54:02 +0000
commit34c3d0a3869720f5aa12c15940e5e83fad0d1347 (patch)
tree553250732e06d892c0ccfe2a4884b181b8d25919 /synapse
parentquick and dirty room membership<->group membership sync script (diff)
downloadsynapse-34c3d0a3869720f5aa12c15940e5e83fad0d1347.tar.xz
typo
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/presence.py2
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: