aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/application.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-03 12:55:29 +0200
committerlain <lain@soykaf.club>2020-05-03 12:55:29 +0200
commit6fb96f64c13597bcf8d10f30442ac61610cec58e (patch)
tree29db6b5d77a562dd496618ebcd54c15574f093a8 /lib/pleroma/application.ex
parent4dfc617cdf1c2579f4f941dcd0fa5c728178df06 (diff)
parent095635453ac58b9e01a32ad226c0b61466c16da0 (diff)
downloadpleroma-6fb96f64c13597bcf8d10f30442ac61610cec58e.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r--lib/pleroma/application.ex1
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() ++