logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 72edc3e30fa3ad9ca2a592186c64e01ef439cdc8
parent: ecff8e92ffca75465ef607d10ad59b318e68cd1e
Author: rinpatch <rinpatch@sdf.org>
Date:   Fri, 24 Jan 2020 11:31:34 +0000

Merge branch 'fix/removing-mdii-uploader-from-descriptions' into 'develop'

Removing deleted MDII uploader from suggestions

Closes admin-fe#64

See merge request pleroma/pleroma!2137

Diffstat:

Mconfig/description.exs2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/description.exs b/config/description.exs @@ -23,7 +23,7 @@ config :pleroma, :config_description, [ key: :uploader, type: :module, description: "Module which will be used for uploads", - suggestions: [Pleroma.Uploaders.Local, Pleroma.Uploaders.MDII, Pleroma.Uploaders.S3] + suggestions: [Pleroma.Uploaders.Local, Pleroma.Uploaders.S3] }, %{ key: :filters,