diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-02 07:39:19 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-02 07:39:19 +0300 |
| commit | cf5ca7e45b7a5df18717c8b6ea0afa045e341f65 (patch) | |
| tree | c586802831c88e484e770a8f62b402fa573485e3 /lib/pleroma/application.ex | |
| parent | 92efb888c7b25692af205b1a4dbce0ae689c439b (diff) | |
| parent | ae921a0c24b9b1dcdea408decc691d66a538b6b8 (diff) | |
| download | pleroma-cf5ca7e45b7a5df18717c8b6ea0afa045e341f65.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications
Diffstat (limited to 'lib/pleroma/application.ex')
| -rw-r--r-- | lib/pleroma/application.ex | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index a00938c04..308d8cffa 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -73,7 +73,6 @@ defmodule Pleroma.Application do Pleroma.Repo, Config.TransferTask, Pleroma.Emoji, - Pleroma.Captcha, Pleroma.Plugs.RateLimiter.Supervisor ] ++ cachex_children() ++ |