Commit b65742d
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 missing2 files changed
+7
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
221 | | - | |
222 | | - | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
223 | 227 | | |
224 | 228 | | |
225 | 229 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
302 | 302 | | |
303 | 303 | | |
304 | 304 | | |
| 305 | + | |
305 | 306 | | |
306 | 307 | | |
307 | 308 | | |
| |||
0 commit comments