diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-14 15:45:05 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-14 15:45:05 +0000 |
| commit | 270f09dbc2cb145e5a06b72189bd1b91dd3d3a02 (patch) | |
| tree | bf75fc306788d784d74fb6ca617f3ddd27b75fd2 /lib/pleroma/application.ex | |
| parent | b7fc722a2e9e93341229cb122aac605421782295 (diff) | |
| parent | c2ca1f22a25d22d6d863406ed05b08c643e5824c (diff) | |
| download | pleroma-270f09dbc2cb145e5a06b72189bd1b91dd3d3a02.tar.gz | |
Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'
Feature/905 dynamic configuration in sql
Closes #905
See merge request pleroma/pleroma!1195
Diffstat (limited to 'lib/pleroma/application.ex')
| -rw-r--r-- | lib/pleroma/application.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 9c93c7a35..ba4cf8486 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -31,6 +31,7 @@ defmodule Pleroma.Application do [ # Start the Ecto repository %{id: Pleroma.Repo, start: {Pleroma.Repo, :start_link, []}, type: :supervisor}, + %{id: Pleroma.Config.TransferTask, start: {Pleroma.Config.TransferTask, :start_link, []}}, %{id: Pleroma.Emoji, start: {Pleroma.Emoji, :start_link, []}}, %{id: Pleroma.Captcha, start: {Pleroma.Captcha, :start_link, []}}, %{ @@ -186,7 +187,7 @@ defmodule Pleroma.Application do else [] end ++ - if Pleroma.Config.get([Pleroma.Uploader, :proxy_remote]) do + if Pleroma.Config.get([Pleroma.Upload, :proxy_remote]) do [:upload] else [] |