Commit 01fb162
committed
Merge branch '2.3' into 2.7
* 2.3:
[Process] Enhance compatiblity with --enable-sigchild
[Process] Always call proc_close
[Validator] Updated Luxembourgish translations for 2.8
[FrameworkBundle] prevent cache:clear creating too long paths
Conflicts:
src/Symfony/Component/Process/Tests/ProcessTest.php
src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
src/Symfony/Component/Process/Tests/SimpleProcessTest.php
src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf1 file changed
+4
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
58 | 60 | | |
59 | 61 | | |
60 | 62 | | |
| |||
75 | 77 | | |
76 | 78 | | |
77 | 79 | | |
78 | | - | |
| 80 | + | |
79 | 81 | | |
80 | 82 | | |
81 | 83 | | |
| |||
114 | 116 | | |
115 | 117 | | |
116 | 118 | | |
117 | | - | |
118 | | - | |
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
| |||
0 commit comments