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

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/upload.ex
index dd2bbab9f44625166c29a3ded1e102c214770295,92a89e2961b72e3d5a2364ed0677f93b6906d1fd..408a3fc560e81958bdf0f19ce3aae85e814df273
--- 1/lib/pleroma/upload.ex
--- 2/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",