Skip to content

Commit 611036a

Browse files
committed
Merge branch '5.1' into 5.2
* 5.1: fix code style Remove full head content in HTML to text converter apply the sort callback on the whole search result
2 parents 3f111c0 + bfc4500 commit 611036a

File tree

1 file changed

+1
-1
lines changed
  • Tests/DependencyInjection/Fixtures/php

1 file changed

+1
-1
lines changed

Tests/DependencyInjection/Fixtures/php/full.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
'fallback' => 'fr',
5252
'paths' => ['%kernel.project_dir%/Fixtures/translations'],
5353
'cache_dir' => '%kernel.cache_dir%/translations',
54-
'enabled_locales' => ['fr', 'en']
54+
'enabled_locales' => ['fr', 'en'],
5555
],
5656
'validation' => [
5757
'enabled' => true,

0 commit comments

Comments
 (0)