diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-08 20:14:28 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-08 20:14:28 +0300 |
commit | 6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9 (patch) | |
tree | 6b8e22663fd5b6d5cdf3afaa4b306775d59b503a /lib/pleroma/application.ex | |
parent | 49bb0a130f93476d32d3177d7a989b7a98a063f2 (diff) | |
parent | af5fef1f228a1781d7d9cad490d3b3a783389f5e (diff) | |
download | pleroma-6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9.tar.gz |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r-- | lib/pleroma/application.ex | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 9dbd1e26b..57462740c 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -147,8 +147,6 @@ defmodule Pleroma.Application do defp oauth_cleanup_child(_), do: [] - defp chat_child(:test, _), do: [] - defp chat_child(_env, true) do [Pleroma.Web.ChatChannel.ChatChannelState] end |