filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Sync Emojis
This commit is contained in:
Benoit Marty 2022-09-12 17:24:58 +02:00 committed by GitHub
parent ec0770434d 0c4707c315
commit 6ac4d58636
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/emojis/emoji_picker_datasource_formatted.json
View File

@ -2368,7 +2368,8 @@
"stare", "stare",
"scared", "scared",
"frightening", "frightening",
"embarrassing" "embarrassing",
"shy"
] ]
}, },
"shushing-face": { "shushing-face": {
@ -9662,7 +9663,8 @@
"flower", "flower",
"wilted", "wilted",
"plant", "plant",
"nature" "nature",
"rose"
] ]
}, },
"hibiscus": { "hibiscus": {
@ -11080,7 +11082,8 @@
"tea", "tea",
"caffeine", "caffeine",
"latte", "latte",
"espresso" "espresso",
"mug"
] ]
}, },
"teapot": { "teapot": {

2
vector/src/main/res/raw/emoji_picker_datasource.json
View File

File diff suppressed because one or more lines are too long