aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/upload.ex
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-06-25 14:16:28 -0500
committerMark Felder <feld@FreeBSD.org>2020-06-25 14:26:21 -0500
commit433c01b370f4bf68d3f016d86c1527b1319e7a0c (patch)
tree607d6c7e4e578d6e0ff95963b5565baefc207d85 /lib/pleroma/upload.ex
parentd4b20c96c4030ebb5eb908dc6efcf45be7a8355d (diff)
parent1d0804b49f56fe722b12f83269d98acfdee7ac77 (diff)
downloadpleroma-433c01b370f4bf68d3f016d86c1527b1319e7a0c.tar.gz
Merge branch 'develop' into refactor/notification_settings
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",