summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-22 17:20:23 +0000
committerlain <lain@soykaf.club>2020-05-22 17:20:23 +0000
commit72189d227f01f7b6e69a947776238931b500c3ed (patch)
treedda37a523285cb8bf8a8e81a206a1f7ddf9bc483
parentddbbefeb2e30afbf86601c4eaf99b5cf00546548 (diff)
parentfabc11bf9ace488582c9621117269b9f56c47277 (diff)
Merge branch 'priv-warning' into 'develop'
priv/static: Add a warning discouraging admins from modifying the static files directly See merge request pleroma/pleroma!2571
-rw-r--r--priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE1
1 files changed, 1 insertions, 0 deletions
diff --git a/priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE b/priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE
new file mode 100644
index 000000000..eb5294eaf
--- /dev/null
+++ b/priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE
@@ -0,0 +1 @@
+If you are an instance admin and you want to modify the instace static files, this is probably not the right place to do it. This directory is checked in version control, so don't be surprised if you get merge conflicts after modifying anything here. Please use instance static directory instead, it has the same directory structure and files placed there will override files placed here. See https://docs.pleroma.social/backend/configuration/static_dir/ for more info