Commit 2fb739d
committed
Merge branch '2.3' into 2.7
* 2.3:
PhpUnitNoDedicateAssertFixer results
Improve Norwegian translations
Simplify markdown for PR template
Conflicts:
src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
0 commit comments