alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix/elixir-1-8-type-annotation' into 'develop' 

Fix Elixir 1.8 type annotation issue

Closes #523

See merge request pleroma/pleroma!668
This commit is contained in:
lambda 2019-01-15 08:51:59 +00:00
parent ab78cfbd07 e8eff9fe03
commit 646bb87816
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/upload.ex
View File

@ -34,8 +34,9 @@ defmodule Pleroma.Upload do
require Logger require Logger
@type source :: @type source ::
Plug.Upload.t() | data_uri_string :: Plug.Upload.t()
String.t() | {:from_local, name :: String.t(), id :: String.t(), path :: String.t()} | (data_uri_string :: String.t())
| {:from_local, name :: String.t(), id :: String.t(), path :: String.t()}
@type option :: @type option ::
{:type, :avatar | :banner | :background} {:type, :avatar | :banner | :background}