logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: dedb1ad5d68406bf16ac47d5ad7d2c12f97a10b4
parent: 19b727bf8f54fb29b1a8258640ac59982810a351
Author: rinpatch <rinpatch@sdf.org>
Date:   Thu, 21 Nov 2019 15:20:05 +0000

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

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

See merge request pleroma/pleroma!2002

Diffstat:

Mconfig/releases.exs2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/releases.exs b/config/releases.exs @@ -1,6 +1,6 @@ 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_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"