aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/upload.ex
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-03-02 15:35:49 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-03-02 15:35:49 +0400
commit4a45b96a91485a39f26bcc86b6cbd21d1547511e (patch)
treeb4a6cc3f7be26b84b85d3a1ff3adc9b896b54e85 /lib/pleroma/upload.ex
parentf446744a6a72d707504c2ba20ea2326f956b5097 (diff)
parent45b08ca1665920564c9daf35a96e93dff031a649 (diff)
downloadpleroma-4a45b96a91485a39f26bcc86b6cbd21d1547511e.tar.gz
Merge branch 'develop' into fix/signup-without-email
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}