diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-01-15 18:12:08 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-01-15 18:12:08 +0300 |
| commit | 5304c8cd21d72d66e5e9dc9f057ffbbe027ef5fa (patch) | |
| tree | d463c35ba67fe75d8eea92097db43650f5626129 /config/config.exs | |
| parent | 76c1948880687ed74e0275e51808c0ddc6be887d (diff) | |
| parent | 1b233aa6531b26943bd78c5d4cd8e00f2e1d318e (diff) | |
| download | pleroma-5304c8cd21d72d66e5e9dc9f057ffbbe027ef5fa.tar.gz pleroma-5304c8cd21d72d66e5e9dc9f057ffbbe027ef5fa.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
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 e2901cf12..b0036fff0 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"], |