diff options
| author | lain <lain@soykaf.club> | 2021-01-07 10:06:39 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-07 10:06:39 +0000 |
| commit | f1ca2ac64bf5a308401f3155360e94a058e99e4e (patch) | |
| tree | 283c7bdbeff9e3bb0a65b9cea1b459f76daaf88d /config | |
| parent | 5e128a6be30563adc3b8a938aa68d18ac04cdfa0 (diff) | |
| parent | 48cd336a720086695613decc2a1a6852245c1df5 (diff) | |
| download | pleroma-f1ca2ac64bf5a308401f3155360e94a058e99e4e.tar.gz pleroma-f1ca2ac64bf5a308401f3155360e94a058e99e4e.zip | |
Merge branch 'upstream/remote-emoji-support' into 'develop'
Upstream external emoji support
See merge request pleroma/pleroma!3238
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 52b714ee5..a2c5add2e 100644 --- a/config/emoji.txt +++ b/config/emoji.txt @@ -1,3 +1,4 @@ firefox, /emoji/Firefox.gif, Gif,Fun blank, /emoji/blank.png, Fun dinosaur, /emoji/dino walking.gif, Gif +external_emoji, https://example.com/emoji.png |