Commit 9c0ce8f
committed
Merge branch '6.4' into 7.0
* 6.4:
Sync .github/expected-missing-return-types.diff
[WebProfilerBundle] Fix the design of the compact toolbar button
[AssetMapper] Improve link generation script
fix merge
consistently use dates in UTC in Doctrine connection tests
Add missing Chinese(zh_TW) translations
[Intl] [Emoji] Fix emoji files (remove wrong characters / add missing data)
[Translation] Crowdin Bridge: use the project language mapping
[VarExporter] Nitpicking in README.md
[DoctrineBridge] Adapt deprecation message to include ODM bundle attribute name
Added missing Serbian (sr_Cyrl) translation
[Validator] Add missing Serbian translation
[Validator] Add missing arabic translation
[Validator] updated Albanian translation
[Clock] Fix calling `mockTime()` in `setUpBeforeClass()`File tree
2 files changed
+2
-2
lines changed- Tests
2 files changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
200 | 200 | | |
201 | 201 | | |
202 | 202 | | |
203 | | - | |
| 203 | + | |
204 | 204 | | |
205 | 205 | | |
206 | 206 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
0 commit comments