diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-17 16:41:09 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-17 16:41:09 +0000 |
| commit | 05967472f296fc782c15f0d8ebbeaeadb03b0f8c (patch) | |
| tree | 644c103c3e0608e017679bd52e64a12bd2689890 /config | |
| parent | e4f57f89de0ac947393362b665cb72eb9c0a35b0 (diff) | |
| parent | 59e079f641c2aed70a698fdcf4908a9f31a959f2 (diff) | |
| download | pleroma-05967472f296fc782c15f0d8ebbeaeadb03b0f8c.tar.gz pleroma-05967472f296fc782c15f0d8ebbeaeadb03b0f8c.zip | |
Merge branch 'feature/uploader-mdii' into 'develop'
Feature / MDII Uploader
See merge request pleroma/pleroma!454
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 9cc558564..af0fdca9a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -23,6 +23,10 @@ config :pleroma, Pleroma.Uploaders.S3, public_endpoint: "https://s3.amazonaws.com", force_media_proxy: false +config :pleroma, Pleroma.Uploaders.MDII, + cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi", + files: "https://mdii.sakura.ne.jp" + config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"] config :pleroma, :uri_schemes, |