diff options
| author | Tristan Mahé <gled@remote-shell.net> | 2018-07-13 11:14:37 -0700 |
|---|---|---|
| committer | Tristan Mahé <gled@remote-shell.net> | 2018-07-13 11:14:37 -0700 |
| commit | 5469fb9561bb886deb8434e545dfb711eb20f341 (patch) | |
| tree | 78ab675afd6169e2497b5c47882725cc1d2f2326 /config/config.exs | |
| parent | c06a5af386a3cdfeda0b2c21963d9200fb7d6c89 (diff) | |
| parent | d93789dfde3c44c76a56732088a897ddddfe9716 (diff) | |
| download | pleroma-5469fb9561bb886deb8434e545dfb711eb20f341.tar.gz pleroma-5469fb9561bb886deb8434e545dfb711eb20f341.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
Diffstat (limited to 'config/config.exs')
| -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 33b7f098e..b3c3c37c8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -14,6 +14,8 @@ config :pleroma, Pleroma.Upload, uploads: "uploads", strip_exif: false +config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"] + # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, url: [host: "localhost"], |