From: Tristan Mahé <gled@remote-shell.net>
Date: Fri, 13 Jul 2018 18:14:37 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5469fb9561bb886deb8434e545dfb711eb20f341;p=akkoma

Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
---

5469fb9561bb886deb8434e545dfb711eb20f341
diff --cc config/config.exs
index 33b7f098e,0616fe4fb..b3c3c37c8
--- a/config/config.exs
+++ b/config/config.exs
@@@ -10,10 -10,10 +10,12 @@@ config :pleroma, ecto_repos: [Pleroma.R
  
  config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
  
 -config :pleroma, Pleroma.Upload, uploads: "uploads"
 +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"],