summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-07-25 07:16:50 +0000
committerlambda <pleromagit@rogerbraun.net>2018-07-25 07:16:50 +0000
commitba72c51a0f6f8a64a24a96c89d4cb8cfcfb7a245 (patch)
tree838d334208c4dadf23b974181c0ad4c17b199f8c /config/config.exs
parent41b0ecef959df0a1cda71e56e256cacebe48d56f (diff)
parentbc2668bb63aee2c42cdea48782ba5ef291c17b45 (diff)
downloadpleroma-ba72c51a0f6f8a64a24a96c89d4cb8cfcfb7a245.tar.gz
pleroma-ba72c51a0f6f8a64a24a96c89d4cb8cfcfb7a245.zip
Merge branch 'feature/filter_exif' into 'develop'
Feature/filter exif ( solve #187 ) See merge request pleroma/pleroma!237
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 922acea4b..3a7301348 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -10,7 +10,9 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
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"]