From: Maksim Pechnikov <parallel588@gmail.com>
Date: Sun, 8 Dec 2019 16:52:46 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1383
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5876a9cb79e53f932d63e457610852031669a222;p=akkoma

Merge branch 'develop' into issue/1383
---

5876a9cb79e53f932d63e457610852031669a222
diff --cc lib/pleroma/application.ex
index 793df56ee,57462740c..0f7b40840
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -135,8 -142,11 +135,6 @@@ defmodule Pleroma.Application d
      [Pleroma.Web.Streamer.supervisor()]
    end
  
-   defp chat_child(:test, _), do: []
 -  defp oauth_cleanup_child(true),
 -    do: [Pleroma.Web.OAuth.Token.CleanWorker]
 -
 -  defp oauth_cleanup_child(_), do: []
--
    defp chat_child(_env, true) do
      [Pleroma.Web.ChatChannel.ChatChannelState]
    end