Commit 152738b
committed
Merge branch '4.3' into 4.4
* 4.3:
cs fix
Partially Revert "Remove trailing space in all markdown files"
[Intl] Explicit check
Fix getMaxFilesize() returning zero
[DI] fix docblocks in Container*
Fixed markdown file
[TwigBridge] Replaced plain doc block copies with inheritdoc.
[DomCrawler] Fixed CHANGELOG markup
[Intl] Cleanup unused language aliases entryFile tree
2 files changed
+3
-5
lines changed- Data/Generator
- Resources/data/languages
2 files changed
+3
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
169 | 169 | | |
170 | 170 | | |
171 | 171 | | |
172 | | - | |
173 | 172 | | |
174 | 173 | | |
175 | 174 | | |
| |||
185 | 184 | | |
186 | 185 | | |
187 | 186 | | |
188 | | - | |
189 | | - | |
190 | | - | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
191 | 190 | | |
192 | 191 | | |
193 | 192 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
618 | 618 | | |
619 | 619 | | |
620 | 620 | | |
621 | | - | |
622 | 621 | | |
623 | 622 | | |
624 | 623 | | |
| |||
0 commit comments