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

Sync Emojis
2024-11-15 01:35:07 +08:00 · 2022-09-12 17:24:58 +02:00 · 2022-09-12 17:24:58 +02:00 · 6ac4d58636
commit 6ac4d58636
parent ec0770434d 0c4707c315
2 changed files with 7 additions and 4 deletions
--- a/tools/emojis/emoji_picker_datasource_formatted.json
+++ b/tools/emojis/emoji_picker_datasource_formatted.json
@ -2368,7 +2368,8 @@
                "stare",
                "scared",
                "frightening",
-                "embarrassing"
+                "embarrassing",
+                "shy"
            ]
        },
        "shushing-face": {
@ -9662,7 +9663,8 @@
                "flower",
                "wilted",
                "plant",
-                "nature"
+                "nature",
+                "rose"
            ]
        },
        "hibiscus": {
@ -11080,7 +11082,8 @@
                "tea",
                "caffeine",
                "latte",
-                "espresso"
+                "espresso",
+                "mug"
            ]
        },
        "teapot": {
--- a/vector/src/main/res/raw/emoji_picker_datasource.json
+++ b/vector/src/main/res/raw/emoji_picker_datasource.json