Commit cb22aff
committed
Merge branch '5.4' into 6.4
* 5.4:
[Validator] Fix 58691 (missing plural-options in serbian language translation)
profiler form data collector extart value property if it is setted
[Process] Fix escaping /X arguments on Windows
[Config] Handle Phar absolute path in `FileLocator`File tree
7 files changed
+125
-116
lines changed- src/Symfony
- Bundle/WebProfilerBundle/Resources/views/Collector
- Component
- Config
- Tests
- Process
- Tests
- Validator/Resources/translations
7 files changed
+125
-116
lines changedLines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
646 | 646 | | |
647 | 647 | | |
648 | 648 | | |
649 | | - | |
650 | | - | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
651 | 653 | | |
652 | 654 | | |
653 | 655 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
| 90 | + | |
90 | 91 | | |
91 | 92 | | |
92 | 93 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1582 | 1582 | | |
1583 | 1583 | | |
1584 | 1584 | | |
1585 | | - | |
| 1585 | + | |
1586 | 1586 | | |
1587 | 1587 | | |
1588 | 1588 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1436 | 1436 | | |
1437 | 1437 | | |
1438 | 1438 | | |
1439 | | - | |
| 1439 | + | |
| 1440 | + | |
| 1441 | + | |
| 1442 | + | |
| 1443 | + | |
| 1444 | + | |
1440 | 1445 | | |
1441 | 1446 | | |
1442 | 1447 | | |
| |||
Lines changed: 37 additions & 37 deletions
Large diffs are not rendered by default.
Lines changed: 75 additions & 75 deletions
Large diffs are not rendered by default.
0 commit comments