Merge remote-tracking branch 'origin/develop' into conversations_three

.gitignore

CHANGELOG.md

COPYING

README.md

config/config.exs

config/dev.exs

config/test.exs

docs/api/admin_api.md

docs/api/differences_in_mastoapi_responses.md

docs/api/pleroma_api.md

docs/config.md

docs/config/custom_emoji.md

docs/installation/arch_linux_en.md

docs/installation/gentoo_en.md

installation/download-mastofe-build.sh

installation/pleroma.nginx

installation/pleroma.supervisord

lib/healthcheck.ex

lib/mix/tasks/pleroma/database.ex

lib/mix/tasks/pleroma/emoji.ex