diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-14 14:52:00 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-14 14:52:00 +0300 |
| commit | 70c7a26de8135ddc089fc0d2e0766e2e793d505c (patch) | |
| tree | 6c9745a08d5708bc73738679a2fe6857be6ed306 /config/config.exs | |
| parent | 1630ecaa20894c6e18b83ce1a830184d577150c3 (diff) | |
| parent | 12b28c8925c2c55e0d7bb66ff3320532a1aade3b (diff) | |
| download | pleroma-70c7a26de8135ddc089fc0d2e0766e2e793d505c.tar.gz pleroma-70c7a26de8135ddc089fc0d2e0766e2e793d505c.zip | |
Merge branch 'develop' into admin-be
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index df677c2e0..0a8f1465c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -108,10 +108,6 @@ config :pleroma, Pleroma.Uploaders.S3, streaming_enabled: true, public_endpoint: "https://s3.amazonaws.com" -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"], pack_extensions: [".png", ".gif"], |