hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into issue/1383

Browse source
This commit is contained in:
Maksim Pechnikov 2019-12-08 19:52:46 +03:00
commit 5876a9cb79
55 changed files with 1159 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/application.ex
View file

@ -135,8 +135,6 @@ defmodule Pleroma.Application do
[Pleroma.Web.Streamer.supervisor()]
end
defp chat_child(:test, _), do: []
defp chat_child(_env, true) do
[Pleroma.Web.ChatChannel.ChatChannelState]
end