diff options
| author | lain <lain@soykaf.club> | 2020-05-25 13:57:27 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-25 13:57:27 +0200 |
| commit | ee35bb5ac287e0ff913685256a826e759add3fb9 (patch) | |
| tree | 971031903f987e4b70768ac1f91666fdfe6a10b4 /priv/static | |
| parent | 578ed3a37f28ecbd9fd976c54ee53e8ed2a6adff (diff) | |
| parent | ec470c4c7717dc9479df9e7b70f9805dcf2f5e08 (diff) | |
| download | pleroma-ee35bb5ac287e0ff913685256a826e759add3fb9.tar.gz pleroma-ee35bb5ac287e0ff913685256a826e759add3fb9.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'priv/static')
| -rw-r--r-- | priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE | 1 |
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 |