diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-02 16:36:54 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-02 16:36:54 +0300 |
commit | 61180ab6f4b85ab78de2eaf1bc1b974c9e7908af (patch) | |
tree | 0970691b2060e06b6feaf4e645021298a7efda0d /docs/installation/further_reading.include | |
parent | 0e23138b50f1fdd9ea78df31eec1b3caac905e2c (diff) | |
parent | 4c044f62258b33a95b8281e1eb42a5e0ce47d42d (diff) | |
download | pleroma-61180ab6f4b85ab78de2eaf1bc1b974c9e7908af.tar.gz pleroma-61180ab6f4b85ab78de2eaf1bc1b974c9e7908af.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
Diffstat (limited to 'docs/installation/further_reading.include')
-rw-r--r-- | docs/installation/further_reading.include | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/installation/further_reading.include b/docs/installation/further_reading.include new file mode 100644 index 000000000..46752c722 --- /dev/null +++ b/docs/installation/further_reading.include @@ -0,0 +1,5 @@ +* [How Federation Works/Why is my Federated Timeline empty?](https://blog.soykaf.com/post/how-federation-works/) +* [Backup your instance](../administration/backup.md) +* [Updating your instance](../administration/updating.md) +* [Hardening your instance](../configuration/hardening.md) +* [How to activate mediaproxy](../configuration/howto_mediaproxy.md) |