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

Merge branch 'develop' into admin-be

Browse source
This commit is contained in:
Alexander Strizhakov 2020-01-14 14:52:00 +03:00
commit 70c7a26de8
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
33 changed files with 716 additions and 446 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"],