Merge branch 'develop' into admin-be

This commit is contained in:
Alexander Strizhakov 2020-01-14 14:52:00 +03:00
commit 70c7a26de8
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
33 changed files with 716 additions and 446 deletions

View file

@ -2772,25 +2772,6 @@ config :pleroma, :config_description, [
}
]
},
%{
group: :pleroma,
key: Pleroma.Uploaders.MDII,
description:
"Uploader for https://github.com/hakaba-hitoyo/minimal-digital-image-infrastructure",
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,