Merge branch 'develop' into issue/1383

2020-01-13 12:41:07 +03:00 · 2020-01-13 12:41:07 +03:00 · b7908844f2
commit b7908844f2
parent 54c9db38c8 a431e8c9f7
173 changed files with 2056 additions and 3546 deletions
--- a/config/description.exs
+++ b/config/description.exs
@ -2550,23 +2550,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,