diff options
| author | lain <lain@soykaf.club> | 2021-01-05 20:09:29 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-05 20:09:29 +0000 |
| commit | 18296c74736fbf020c5bb99491b9c0288a687043 (patch) | |
| tree | 461678b71ee102b52ee6e6f75ae50956ba8306cb /config | |
| parent | 20a269ed694127ca59ece9c2e4865a627b4daad3 (diff) | |
| parent | f9090e00e6f6bec903c8df030c4af74ac378fccf (diff) | |
| download | pleroma-18296c74736fbf020c5bb99491b9c0288a687043.tar.gz pleroma-18296c74736fbf020c5bb99491b9c0288a687043.zip | |
Merge branch 'fix/emoji-encoding' into 'develop'
URI.encode custom emojis
Closes #2381
See merge request pleroma/pleroma!3235
Diffstat (limited to 'config')
| -rw-r--r-- | config/emoji.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/emoji.txt b/config/emoji.txt index 200768ad1..52b714ee5 100644 --- a/config/emoji.txt +++ b/config/emoji.txt @@ -1,2 +1,3 @@ firefox, /emoji/Firefox.gif, Gif,Fun blank, /emoji/blank.png, Fun +dinosaur, /emoji/dino walking.gif, Gif |