Merge branch 'master' into update-homeserver-yaml

2019-03-17 20:53:52 +02:00
parent ae912c4529 2f1662626e
commit e65514223e
2 changed files with 8 additions and 3 deletions
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@ -860,9 +860,9 @@ password_providers:
 # For modern android devices the notification content will still appear
 # because it is loaded by the app. iPhone, however will send a
 # notification saying only that a message arrived and who it came from.
-#
-# push:
-#    include_content: true
+
+push:
+   include_content: {{ matrix_synapse_push_include_content|to_json }}


 # spam_checker: