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

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

bc2668bb63aee2c42cdea48782ba5ef291c17b45
diff --cc lib/pleroma/upload.ex
index dd2bbab9f,92a89e296..408a3fc56
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@@ -18,10 -18,8 +18,10 @@@ defmodule Pleroma.Upload d
        File.cp!(file.path, result_file)
      end
  
 +    strip_exif_data(content_type, result_file)
 +
      %{
-       "type" => "Image",
+       "type" => "Document",
        "url" => [
          %{
            "type" => "Link",