aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/upload.ex
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-03 10:08:07 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-03 10:08:07 +0300
commit509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21 (patch)
tree6939fe33f705c384bdf2bc05a348be02b64ec3fc /lib/pleroma/upload.ex
parentf987d83885eef7cd8d114feefe8870a8c5e841c6 (diff)
parent4c02e049358441529c54a72cd11f1c81ee897d49 (diff)
downloadpleroma-509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21.tar.gz
Merge branch 'develop' into gun
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 2e0986197..440199d19 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -37,6 +37,7 @@ defmodule Pleroma.Upload do
Plug.Upload.t()
| (data_uri_string :: String.t())
| {:from_local, name :: String.t(), id :: String.t(), path :: String.t()}
+ | map()
@type option ::
{:type, :avatar | :banner | :background}