summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorMatrix <matrix@matrix.org>2017-02-24 16:01:57 +0000
committerMatrix <matrix@matrix.org>2017-02-24 16:01:57 +0000
commit8d910ff5b9610ffd22dda7253221891106460c29 (patch)
tree241171d1d1b5ed73ede0bfe50fd869396c46569a /synapse/handlers/sync.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
downloadsynapse-8d910ff5b9610ffd22dda7253221891106460c29.tar.xz
Local changes 2017-02-27-before
Diffstat (limited to 'synapse/handlers/sync.py')
-rw-r--r--synapse/handlers/sync.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index d7dcd1ce5b..71ecceb97c 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -539,7 +539,7 @@ class SyncHandler(object): since_token is None and sync_config.filter_collection.blocks_all_presence() ) - if not block_all_presence_data: + if False or not block_all_presence_data: yield self._generate_sync_entry_for_presence( sync_result_builder, newly_joined_rooms, newly_joined_users )