diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-07-12 05:56:29 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-07-12 05:56:29 +0000 |
| commit | 14054dd582f905439bb73368335f93bbb9bc23c7 (patch) | |
| tree | d5eefa933d2673cb9c0f7147c72da58a887307ec /config | |
| parent | 33b033421649f6a7354616ff3458b856ca89637c (diff) | |
| parent | 748fff6544cc70476bb0892a661d4d8c7f6ee295 (diff) | |
| download | pleroma-14054dd582f905439bb73368335f93bbb9bc23c7.tar.gz pleroma-14054dd582f905439bb73368335f93bbb9bc23c7.zip | |
Merge branch 'feature/auto-shortcodes' into 'develop'
Feature: automatic shortcodes for emoji
See merge request pleroma/pleroma!245
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index cf6cbaa9d..0616fe4fb 100644 --- a/config/config.exs +++ b/config/config.exs @@ -12,6 +12,8 @@ config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes config :pleroma, Pleroma.Upload, uploads: "uploads" +config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"] + # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, url: [host: "localhost"], |