Skip to content

Commit 66e3f2d

Browse files
Merge branch '5.3' into 5.4
* 5.3: (22 commits) [DI] fix fixture [ErrorHandler] fix handling buffered SilencedErrorContext [HttpClient] fix Psr18Client when allow_url_fopen=0 [DependencyInjection] Add support of PHP enumerations [Cache] handle prefixed redis connections when clearing pools [Cache] fix eventual consistency when using RedisTagAwareAdapter with a cluster [Uid] Prevent double validation in Uuid::fromString() with base32 values [Uid] Fix fromString() with low base58 values [Validator][Translation] Add ExpressionLanguageSyntax en and fr [HttpKernel] [HttpCache] Keep s-maxage=0 from ESI sub-responses Avoid broken action URL in text notification mail Fix references to CheckRememberMeConditionsListener [DependencyInjection] accept service locator definitions with no class [Cache] Disable locking on Windows by default [DependencyInjection] Fix binding "iterable $foo" when using the PHP-DSL [Config] fix tracking default values that reference the parent class [DependencyInjection] fix accepted types on FactoryTrait::factory() Fix special char used to create cache key [Runtime] Fix project dir variable when vendor not in project root [VarDumper] Fix tests for PHP 8.1 ...
2 parents 0d6cfe9 + 61d1415 commit 66e3f2d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Resources/views/Email/zurb_2/notification/body.txt.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
{% block action %}
1010
{% if action_url %}
11-
{{ action_url }}: {{ action_text }}
11+
{{ action_text }}: {{ action_url }}
1212
{% endif %}
1313
{% endblock %}
1414

0 commit comments

Comments
 (0)