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

This commit is contained in:
Tristan Mahé 2018-07-19 17:44:18 -07:00
commit bc2668bb63
16 changed files with 160 additions and 30 deletions

View file

@ -21,7 +21,7 @@ defmodule Pleroma.Upload do
strip_exif_data(content_type, result_file)
%{
"type" => "Image",
"type" => "Document",
"url" => [
%{
"type" => "Link",