diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-02-04 14:05:30 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-02-04 14:05:30 +0000 |
| commit | 49741961f234816c1fff278adca397e9ff7cabe7 (patch) | |
| tree | 62ba6df4e571c5839d030f910229980be2293630 /config | |
| parent | a7864a94295eedaee1c2ad0829c9b668c7acd705 (diff) | |
| parent | 887db076b55764f1cc7757df06f5ff8587de9798 (diff) | |
| download | pleroma-49741961f234816c1fff278adca397e9ff7cabe7.tar.gz pleroma-49741961f234816c1fff278adca397e9ff7cabe7.zip | |
Merge branch 'chore/external-emoji-example' into 'develop'
Stop external emoji example from leaking
See merge request pleroma/pleroma!3302
Diffstat (limited to 'config')
| -rw-r--r-- | config/emoji.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/emoji.txt b/config/emoji.txt index a2c5add2e..52b714ee5 100644 --- a/config/emoji.txt +++ b/config/emoji.txt @@ -1,4 +1,3 @@ firefox, /emoji/Firefox.gif, Gif,Fun blank, /emoji/blank.png, Fun dinosaur, /emoji/dino walking.gif, Gif -external_emoji, https://example.com/emoji.png |