summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-19 12:49:29 +0000
committerErik Johnston <erik@matrix.org>2016-01-19 12:49:29 +0000
commitf5fc8f29280b91a59aaba3d83dae9e9728aaa3f6 (patch)
treebc6d459a0e5ea88432af7d253daf7e0e46c1f645 /synapse
parentMerge pull request #502 from matrix-org/erikj/push_notif_perf (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into default_notify (diff)
downloadsynapse-f5fc8f29280b91a59aaba3d83dae9e9728aaa3f6.tar.xz
Merge pull request #486 from matrix-org/default_notify
Change default pushrules back to notifying for all messages.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/push/baserules.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index e1217b5c52..3b526c4e33 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -237,7 +237,6 @@ BASE_APPEND_UNDERRIDE_RULES = [
     },
     {
         'rule_id': 'global/underride/.m.rule.message',
-        'enabled': False,
         'conditions': [
             {
                 'kind': 'event_match',