diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-17 17:53:47 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-17 17:53:47 +0300 |
| commit | 9ea31b373fdb75bb6aa04d006e5f493158897efa (patch) | |
| tree | b7301d21a9bc675984bb11b40c96148c0205270e /lib/pleroma/application.ex | |
| parent | a859d9bc15cd1e4ff15bb63d6c114f71783118ef (diff) | |
| parent | 023f726d7f497705d766adee8874b94efb08a0aa (diff) | |
| download | pleroma-9ea31b373fdb75bb6aa04d006e5f493158897efa.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
Diffstat (limited to 'lib/pleroma/application.ex')
| -rw-r--r-- | lib/pleroma/application.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 4b2512acd..d7e3a649f 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -95,6 +95,7 @@ defmodule Pleroma.Application do [ Pleroma.Stats, Pleroma.JobQueueMonitor, + {Majic.Pool, [name: Pleroma.MajicPool, pool_size: Config.get([:majic_pool, :size], 2)]}, {Oban, Config.get(Oban)} ] ++ task_children(@env) ++ |