Skip to content

Commit bac1107

Browse files
Merge branch '7.0' into 7.1
* 7.0: 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()`
2 parents 02bb780 + 5fbee19 commit bac1107

24 files changed

+44462
-20310
lines changed

Resources/data/transliterator/emoji/emoji-ar_sa.php

Lines changed: 2291 additions & 0 deletions
Large diffs are not rendered by default.

Resources/data/transliterator/emoji/emoji-de_ch.php

Lines changed: 3404 additions & 1473 deletions
Large diffs are not rendered by default.

Resources/data/transliterator/emoji/emoji-en_001.php

Lines changed: 3260 additions & 1 deletion
Large diffs are not rendered by default.

Resources/data/transliterator/emoji/emoji-en_au.php

Lines changed: 3403 additions & 1468 deletions
Large diffs are not rendered by default.

Resources/data/transliterator/emoji/emoji-en_ca.php

Lines changed: 3418 additions & 1493 deletions
Large diffs are not rendered by default.

Resources/data/transliterator/emoji/emoji-en_gb.php

Lines changed: 2718 additions & 1563 deletions
Large diffs are not rendered by default.

Resources/data/transliterator/emoji/emoji-en_in.php

Lines changed: 1815 additions & 1568 deletions
Large diffs are not rendered by default.

Resources/data/transliterator/emoji/emoji-es_419.php

Lines changed: 2696 additions & 1181 deletions
Large diffs are not rendered by default.

Resources/data/transliterator/emoji/emoji-es_mx.php

Lines changed: 2901 additions & 1322 deletions
Large diffs are not rendered by default.

Resources/data/transliterator/emoji/emoji-es_us.php

Lines changed: 2928 additions & 1312 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)