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

diff --cc config/config.exs
index 33b7f098ee7079985c104e931d111842df323a79,0616fe4fb19d48a5ad288749c42af5a0fb64e49e..b3c3c37c8ef855acfc56c84f5c9e8501333dc536
--- 1/config/config.exs
--- 2/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"],