logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 6786ad3d983a37728654fccfa525498c77683cdc
parent: 0554d91dcdc4263594ca02d4796c59bda49de3ce
Author: lambda <pleromagit@rogerbraun.net>
Date:   Mon, 10 Dec 2018 19:04:06 +0000

Merge branch 'fix/theora-detection-read-bytes' into 'develop'

Fix Theora detection in mime.ex

See merge request pleroma/pleroma!493

Diffstat:

Mlib/pleroma/mime.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/mime.ex b/lib/pleroma/mime.ex @@ -3,7 +3,7 @@ defmodule Pleroma.MIME do Returns the mime-type of a binary and optionally a normalized file-name. """ @default "application/octet-stream" - @read_bytes 31 + @read_bytes 35 @spec file_mime_type(String.t()) :: {:ok, content_type :: String.t(), filename :: String.t()} | {:error, any()} | :error