Merge develop

2019-05-29 18:18:22 +03:00 · 2019-05-29 18:18:22 +03:00 · ce47017c89
commit ce47017c89
parent f1f7a11222 57e58d2602
151 changed files with 4765 additions and 1553 deletions
--- a/lib/pleroma/emails/admin_email.ex
+++ b/lib/pleroma/emails/admin_email.ex
@ -29,7 +29,7 @@ defmodule Pleroma.Emails.AdminEmail do
      end

    statuses_html =
-      if length(statuses) > 0 do
+      if is_list(statuses) && length(statuses) > 0 do
        statuses_list_html =
          statuses
          |> Enum.map(fn