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

Merge develop

Browse source
This commit is contained in:
Roman Chvanikov 2019-07-09 21:21:09 +03:00
commit 371d39e160
224 changed files with 2317 additions and 678 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/application.ex
View file

@ -155,7 +155,11 @@ defmodule Pleroma.Application do
start: {Pleroma.Web.Endpoint, :start_link, []},
type: :supervisor
},
%{id: Pleroma.Gopher.Server, start: {Pleroma.Gopher.Server, :start_link, []}}
%{id: Pleroma.Gopher.Server, start: {Pleroma.Gopher.Server, :start_link, []}},
%{
id: Pleroma.User.SynchronizationWorker,
start: {Pleroma.User.SynchronizationWorker, :start_link, []}
}
]
# See http://elixir-lang.org/docs/stable/elixir/Supervisor.html