aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-11-21 15:20:05 +0000
committerrinpatch <rinpatch@sdf.org>2019-11-21 15:20:05 +0000
commitdedb1ad5d68406bf16ac47d5ad7d2c12f97a10b4 (patch)
tree4178398494d1a3e8f2a5c39ae9d0ae2d2ec94398
parent19b727bf8f54fb29b1a8258640ac59982810a351 (diff)
parentdc9303eac563d23aebce04ad03e55ab072e548ed (diff)
downloadpleroma-dedb1ad5d68406bf16ac47d5ad7d2c12f97a10b4.tar.gz
Merge branch 'revert-5c6c3026' into 'develop'
Revert "Merge branch 'patch-1' into 'develop'" See merge request pleroma/pleroma!2002
-rw-r--r--config/releases.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/releases.exs b/config/releases.exs
index 36c493673..98c5ceccd 100644
--- 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"