summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-01-14 16:26:56 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-01-14 21:29:14 +0300
commitc9f45edeac2cc3ed262bb4b30dc7e1120c6fa047 (patch)
tree3ba35681409d9c5dd9ca4d355ff39d4dd67448d4 /config/description.exs
parent969769730e0b7578ddc6a5cd02f9b24eff5902a0 (diff)
parent12b28c8925c2c55e0d7bb66ff3320532a1aade3b (diff)
downloadpleroma-c9f45edeac2cc3ed262bb4b30dc7e1120c6fa047.tar.gz
pleroma-c9f45edeac2cc3ed262bb4b30dc7e1120c6fa047.zip
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'config/description.exs')
-rw-r--r--config/description.exs17
1 files changed, 0 insertions, 17 deletions
diff --git a/config/description.exs b/config/description.exs
index 45e4b43f1..1089fd86c 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2559,23 +2559,6 @@ config :pleroma, :config_description, [
},
%{
group: :pleroma,
- key: Pleroma.Uploaders.MDII,
- type: :group,
- children: [
- %{
- key: :cgi,
- type: :string,
- suggestions: ["https://mdii.sakura.ne.jp/mdii-post.cgi"]
- },
- %{
- key: :files,
- type: :string,
- suggestions: ["https://mdii.sakura.ne.jp"]
- }
- ]
- },
- %{
- group: :pleroma,
key: :http,
type: :group,
description: "HTTP settings",