Commit b48517d
committed
Merge branch '6.4' into 7.2
* 6.4:
[Routing] Add test to validate that default value is allowed to not match requirement
fix handling required options
Fix @var phpdoc
[Lock] [MongoDB] Enforce readPreference=primary and writeConcern=majority
[FrameworkBundle] fix phpdoc in `MicroKernelTrait`
Fixed validator translations for Albanian1 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1368 | 1368 | | |
1369 | 1369 | | |
1370 | 1370 | | |
1371 | | - | |
| 1371 | + | |
1372 | 1372 | | |
1373 | 1373 | | |
1374 | 1374 | | |
| |||
1386 | 1386 | | |
1387 | 1387 | | |
1388 | 1388 | | |
1389 | | - | |
| 1389 | + | |
1390 | 1390 | | |
1391 | 1391 | | |
1392 | 1392 | | |
| |||
0 commit comments