Merge branch 'develop' into refactor/notification_settings

[akkoma] / lib / pleroma / mime.ex

diff --git a/lib/pleroma/mime.ex b/lib/pleroma/mime.ex
index 36771533f01336c8331ebd7d989273437212228d..6ee055f500083492549930801cc3948266b287d1 100644 (file)
--- a/lib/pleroma/mime.ex
+++ b/lib/pleroma/mime.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.MIME do
@@ -9,7 +9,7 @@ defmodule Pleroma.MIME do
   @default "application/octet-stream"
   @read_bytes 35
 
-  @spec file_mime_type(String.t()) ::
+  @spec file_mime_type(String.t(), String.t()) ::
           {:ok, content_type :: String.t(), filename :: String.t()} | {:error, any()} | :error
   def file_mime_type(path, filename) do
     with {:ok, content_type} <- file_mime_type(path),