Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16439 from samcake/zorro

Browse source 
Ending a joke
This commit is contained in:
Zach Fox 2019-11-01 13:01:55 -07:00 committed by GitHub
commit 44e196c588
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/emojis/512px/sam.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 253 KiB

BIN
scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/emojis/52px/sam.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 14 KiB

9
scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/modules/customEmojiList.js
View file

@ -1,12 +1,5 @@
var customEmojiList = [ var customEmojiList = [
{
"name": "sam",
"filename": "sam.png",
"keywords": [
"sam",
"troll"
]
}
] ]
if (module.exports) { if (module.exports) {