Merge branch 'develop' into issue/1383

diff --cc config/config.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge

diff --cc lib/pleroma/application.ex
index 793df56eef473b44de8f755acf3af5ceb5245077,57462740c086142627c958f3ed21917b5740ae21..0f7b40840e79ef22c7695251aefc5ff972a82390
--- 1/lib/pleroma/application.ex
--- 2/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

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/support/helpers.ex
Simple merge