8000 Merge remote-tracking branch 'origin/3.4' into 3.4 · symfony/symfony@70166f0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 70166f0

Browse files
nicolas-grekasnicolas-grekas
committed
Merge remote-tracking branch 'origin/3.4' into 3.4
* origin/3.4: [FrameworkBundle] minor: remove a typo from changelog
2 parents 47cd029 + a288a74 commit 70166f0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ CHANGELOG
7070
The default value will be `state_machine` in Symfony 4.0.
7171
* Deprecated the `CompilerDebugDumpPass` class
7272
* Deprecated the "framework.trusted_proxies" configuration option and the corresponding "kernel.trusted_proxies" parameter
73-
* Added a new new version strategy option called json_manifest_path
73+
* Added a new version strategy option called "json_manifest_path"
7474
that allows you to use the `JsonManifestVersionStrategy`.
7575
* Added `Symfony\Bundle\FrameworkBundle\Controller\AbstractController`. It provides
7676
the same helpers as the `Controller` class, but does not allow accessing the dependency

0 commit comments

Comments
 (0)
0