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

Merge remote-tracking branch 'upstream/develop' into feature/filter_exif

Browse source
This commit is contained in:
Tristan Mahé 2018-07-13 11:14:37 -07:00
commit 5469fb9561
27 changed files with 172 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -14,6 +14,8 @@ config :pleroma, Pleroma.Upload,
uploads: "uploads",
strip_exif: false
config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "localhost"],