Skip to content

Commit

Permalink
Merge pull request #8435 from vector-im/sync-emojis
Browse files Browse the repository at this point in the history
Sync Emojis
  • Loading branch information
bmarty committed May 15, 2023
2 parents 04f5ae1 + 1fdb31d commit dd2bbf6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions tools/emojis/emoji_picker_datasource_formatted.json
Original file line number Diff line number Diff line change
Expand Up @@ -3368,7 +3368,7 @@
"creepy",
"devil",
"demon",
"japanese"
"japanese_ogre"
]
},
"goblin": {
Expand All @@ -3385,7 +3385,7 @@
"mask",
"scary",
"creepy",
"japanese"
"japanese_goblin"
]
},
"ghost": {
Expand Down Expand Up @@ -7459,6 +7459,7 @@
"bicycle",
"biking",
"cyclist",
"bike",
"sport",
"move"
]
Expand All @@ -7471,8 +7472,8 @@
"biking",
"cyclist",
"man",
"sports",
"bike",
"sports",
"exercise",
"hipster"
]
Expand All @@ -7485,8 +7486,8 @@
"biking",
"cyclist",
"woman",
"sports",
"bike",
"sports",
"exercise",
"hipster",
"female"
Expand Down Expand Up @@ -10524,7 +10525,7 @@
"schmear",
"food",
"bread",
"jewish"
"jewish_bakery"
]
},
"pancakes": {
Expand Down Expand Up @@ -18549,6 +18550,7 @@
"forbidden",
"no",
"prohibited",
"no_bikes",
"cyclist",
"circle"
]
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/res/raw/emoji_picker_datasource.json

Large diffs are not rendered by default.

0 comments on commit dd2bbf6

Please sign in to comment.