Ivan Tashkinov 1838f739d1 Merge remote-tracking branch 'remotes/origin/develop' into oauth-form ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/templates/layout/app.html.eex		2020-10-29 19:21:27 +03:00
..
cheatsheet.md	Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts	2020-10-16 17:36:02 +00:00
custom_emoji.md
hardening.md
howto_database_config.md	Merge branch 'develop' into fix/configdb-otp-instructions	2020-07-30 13:04:49 -05:00
howto_mediaproxy.md
howto_mongooseim.md
howto_proxy.md
howto_set_richmedia_cache_ttl_based_on_image.md
howto_theming_your_instance.md
i2p.md
mrf.md
onion_federation.md
postgresql.md
static_dir.md	Merge remote-tracking branch 'upstream/develop' into oauth-form	2020-10-08 15:08:47 -05:00
storing_remote_media.md