minibikini authored 5 years ago and kaniini committed 5 years ago

This reverts commit fe7fd331, reversing
changes made to 4fabf83a.

This reverts commit fe7fd331, reversing
changes made to 4fabf83a.

This reverts merge request !1653

two separate files for config.md and generated config.md

See merge request pleroma/pleroma!1666

(cherry picked from commit 9c64a257)

69faec03 markdown generation to the new file
c625fe6f config.md back
4da0da9a don't track generated_config.md

ref #770

Update .gitignore

This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.

If the files are not present in the directory, the bundled ones in
priv/static will be used.

Wiki page should also be updated to recommend that admins put their custom emojis in /priv/static/emoji/custom/. This both makes for less hassle when doing a pull. And also prevents more mess in the /priv/static/emoji/ folder.