diff options
| author | Mark Felder <feld@feld.me> | 2021-02-04 12:37:20 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-02-04 12:37:20 -0600 |
| commit | d04737229196a08db4bc726f8afd55a64dcf8304 (patch) | |
| tree | 8930f46364a986b8252a75428d97016c4b4e093c /config | |
| parent | 000d3365c391fb3613c5365f73f5bd51d2555840 (diff) | |
| parent | d7262f7d2232343e47c2206b134a7d794e35c505 (diff) | |
| download | pleroma-d04737229196a08db4bc726f8afd55a64dcf8304.tar.gz pleroma-d04737229196a08db4bc726f8afd55a64dcf8304.zip | |
Merge branch 'develop' into fix/reports-from-admins
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 |