diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:54:55 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:54:55 +0100 |
commit | 2d4d2bbae4f35e3128fa492e45cfc5b0750524bc (patch) | |
tree | 8e3fa03a60443dc2a1af80d5fb13aa0e28ffddca /synapse/handlers/presence.py | |
parent | Write a default log_config when generating config (diff) | |
parent | Add get_rooms_for_user cache (diff) | |
download | synapse-2d4d2bbae4f35e3128fa492e45cfc5b0750524bc.tar.xz |
Merge branch 'develop' into markjh/config_cleanup
Conflicts: synapse/config/captcha.py
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 42cd528908..9e15610401 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -881,7 +881,7 @@ class PresenceEventSource(object): # TODO(paul): limit for serial, user_ids in presence._remote_offline_serials: - if serial < from_key: + if serial <= from_key: break if serial > max_serial: |