pleroma

commit: 72189d227f01f7b6e69a947776238931b500c3ed
parent: ddbbefeb2e30afbf86601c4eaf99b5cf00546548
Author: lain <lain@soykaf.club>
Date:   Fri, 22 May 2020 17:20:23 +0000

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
Diffstat:
A
priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE 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