Skip to content

Commit

Permalink
Merge branch '5.4' into 6.2
Browse files Browse the repository at this point in the history
* 5.4:
  [Serializer] Preserve array keys while denormalize variadic parameters
  [FrameworkBundle] enable metadata cache when annotation is disabled
  TranslatorBag::diff now iterates over catalogue domains instead of operation domains
  [HttpClient] Fix not calling the on progress callback when canceling a MockResponse
  [TwigBridge] Fix raw content rendering in HTML notification emails
  • Loading branch information
nicolas-grekas committed Mar 31, 2023
2 parents 3414196 + e5b1744 commit 30e3ad6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Resources/views/Email/zurb_2/notification/body.html.twig
Expand Up @@ -26,7 +26,7 @@
{% if markdown %}
{{ include('@email/zurb_2/notification/content_markdown.html.twig') }}
{% else %}
{{ (raw ? content|raw : content)|nl2br }}
{{ raw ? content|raw : content|nl2br }}
{% endif %}
{% endblock %}

Expand Down

0 comments on commit 30e3ad6

Please sign in to comment.