aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/upload.ex
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-06-12 16:52:52 -0500
committerMark Felder <feld@FreeBSD.org>2020-06-12 16:52:52 -0500
commit26f710b9e36d286ee34dd679fdaf99e39d8c0bf2 (patch)
tree168a4f0522a19d424aaaefa0c85e63139c8fead2 /lib/pleroma/upload.ex
parenta42d135cce3e6326cd8a16f08f4ab83633386c2e (diff)
parente2793744c5dced3ced98acb21a2ef2b13ab65ac9 (diff)
downloadpleroma-26f710b9e36d286ee34dd679fdaf99e39d8c0bf2.tar.gz
Merge branch 'develop' into preload-data
Diffstat (limited to 'lib/pleroma/upload.ex')
-rw-r--r--lib/pleroma/upload.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 1be1a3a5b..797555bff 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -67,6 +67,7 @@ defmodule Pleroma.Upload do
{:ok,
%{
"type" => opts.activity_type,
+ "mediaType" => upload.content_type,
"url" => [
%{
"type" => "Link",