diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-26 05:34:02 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-26 05:34:02 +0000 |
| commit | 9f8e645dce1c3b0b2e3b2d1547821241690c5027 (patch) | |
| tree | 47018b3ec7f2ed22d2317dbf2a6f0ca287d23c4f /config | |
| parent | e6f036b9adf91aa81afc676c13ccecf04359241c (diff) | |
| parent | 41e4752950079b80e3d5a06d9806686bd3216dff (diff) | |
| download | pleroma-9f8e645dce1c3b0b2e3b2d1547821241690c5027.tar.gz pleroma-9f8e645dce1c3b0b2e3b2d1547821241690c5027.zip | |
Merge branch 'feature/configurable-pack-extensions' into 'develop'
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 5032b24e6..d381a8dc2 100644 --- a/config/config.exs +++ b/config/config.exs @@ -99,6 +99,7 @@ config :pleroma, Pleroma.Uploaders.MDII, config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], + pack_extensions: [".png", ".gif"], groups: [ # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md` Custom: ["/emoji/*.png", "/emoji/**/*.png"] |