pleroma

commit: 646bb878164fadd5f30d37f9bbf7c313d69da209
parent ab78cfbd07b48c08b44bb3e95a2752e45bf96848
Author: lambda <pleromagit@rogerbraun.net>
Date:   Tue, 15 Jan 2019 08:51:59 +0000

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:
M
lib/pleroma/upload.ex
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git 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}