Merge pull request #7848 from vector-im/sync-emojis

Sync Emojis
2023-01-02 12:15:18 +01:00 · 2023-01-02 12:15:18 +01:00 · 4249a1237b
parent e0c2dc0b2f f79c4f3ad1
commit 4249a1237b
2 changed files with 9 additions and 3 deletions
--- a/tools/emojis/emoji_picker_datasource_formatted.json
+++ b/tools/emojis/emoji_picker_datasource_formatted.json
@ -14362,7 +14362,11 @@
                "plant",
                "nature",
                "branch",
-                "summer"
+                "summer",
+                "bamboo",
+                "wish",
+                "star_festival",
+                "tanzaku"
            ]
        },
        "pine-decoration": {
@ -14373,10 +14377,12 @@
                "celebration",
                "Japanese",
                "pine",
+                "japanese",
                "plant",
                "nature",
                "vegetable",
-                "panda"
+                "panda",
+                "new_years"
            ]
        },
        "japanese-dolls": {
--- a/vector/src/main/res/raw/emoji_picker_datasource.json
+++ b/vector/src/main/res/raw/emoji_picker_datasource.json