diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-11-05 18:40:38 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-11-05 18:40:38 +0000 |
| commit | 03702e4c4a3f7ca80d6adcdcd77b39e6a60809c6 (patch) | |
| tree | 9c6fb949fd8f18ba015821956cc130e75fb879a5 /lib/pleroma/application.ex | |
| parent | bd97b3614f2353619ab524844d100b6f25527592 (diff) | |
| parent | fd0e7d18d96fb242088d8c6bb7ea5e1eb7053ce8 (diff) | |
| download | pleroma-03702e4c4a3f7ca80d6adcdcd77b39e6a60809c6.tar.gz | |
Merge branch 'runtime-emojis' into 'develop'
Runtime configured emojis
See merge request pleroma/pleroma!425
Diffstat (limited to 'lib/pleroma/application.ex')
| -rw-r--r-- | lib/pleroma/application.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index f30fcd1e4..d4bc8f63d 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -13,6 +13,7 @@ defmodule Pleroma.Application do worker(Pleroma.Config, [Application.get_all_env(:pleroma)]), # Start the Ecto repository supervisor(Pleroma.Repo, []), + worker(Pleroma.Emoji, []), # Start the endpoint when the application starts supervisor(Pleroma.Web.Endpoint, []), # Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3) @@ -57,8 +58,8 @@ defmodule Pleroma.Application do id: :cachex_idem ), worker(Pleroma.Web.Federator, []), - worker(Pleroma.Gopher.Server, []), - worker(Pleroma.Stats, []) + worker(Pleroma.Stats, []), + worker(Pleroma.Gopher.Server, []) ] ++ if Mix.env() == :test, do: [], |