Commit 0c93dc1
committed
Merge branch '6.4' into 7.1
* 6.4:
fix merge
[Intl] Update ICU data from 74.1 to 75.1
use DeprecatedCallableInfo for Twig callables if possible
[Filesystem] Add a warning about `chown()` and `chgrp()` on Windows
[String] Update wcswidth data with Unicode 16
PhpSubprocess: Add flag PREG_OFFSET_CAPTURE to preg_match to identify the offset
Work around parse_url() bug
[Ldap] Clean `ldap_connect()` call in `LdapTestCase`
[HttpFoundation] Update links for X-Accel-Redirect and fail properly when X-Accel-Mapping is missingFile tree
2 files changed
+20
-2
lines changed- Controller
- Tests/Controller
2 files changed
+20
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
118 | 124 | | |
119 | 125 | | |
120 | 126 | | |
121 | 127 | | |
122 | 128 | | |
123 | | - | |
124 | | - | |
125 | 129 | | |
126 | 130 | | |
127 | 131 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
183 | 183 | | |
184 | 184 | | |
185 | 185 | | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
186 | 200 | | |
187 | 201 | | |
188 | 202 | | |
| |||
0 commit comments