hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks

Browse source
This commit is contained in:
Ivan Tashkinov 2020-01-15 18:12:08 +03:00
commit 5304c8cd21
36 changed files with 791 additions and 447 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/config.exs
View file

@ -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"],