diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-15 08:51:59 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-15 08:51:59 +0000 |
| commit | 646bb878164fadd5f30d37f9bbf7c313d69da209 (patch) | |
| tree | cfe7243ef283283a86d12cd2c6da13639a53e5e3 /lib | |
| parent | ab78cfbd07b48c08b44bb3e95a2752e45bf96848 (diff) | |
| parent | e8eff9fe03faa1922357d438ed973f5b83605aab (diff) | |
| download | pleroma-646bb878164fadd5f30d37f9bbf7c313d69da209.tar.gz pleroma-646bb878164fadd5f30d37f9bbf7c313d69da209.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/upload.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index b19920dff..0a19e737b 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -34,8 +34,9 @@ defmodule Pleroma.Upload do require Logger @type source :: - Plug.Upload.t() | data_uri_string :: - String.t() | {:from_local, name :: String.t(), id :: String.t(), path :: String.t()} + Plug.Upload.t() + | (data_uri_string :: String.t()) + | {:from_local, name :: String.t(), id :: String.t(), path :: String.t()} @type option :: {:type, :avatar | :banner | :background} |