Merge branch 'revert-5c6c3026' into 'develop'

Revert "Merge branch 'patch-1' into 'develop'"

See merge request pleroma/pleroma!2002
This commit is contained in:
rinpatch 2019-11-21 15:20:05 +00:00
commit dedb1ad5d6

View File

@ -1,6 +1,6 @@
import Config import Config
config :pleroma, :instance, static: "/var/lib/pleroma/static" config :pleroma, :instance, static_dir: "/var/lib/pleroma/static"
config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs" config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"