Resolve merge conflict

.gitlab-ci.yml

README.md

config/config.exs

config/test.exs

docs/Admin-API.md

docs/Pleroma-API.md

docs/config.md

installation/pleroma.service

installation/pleroma.vcl

lib/mix/tasks/pleroma/common.ex

lib/mix/tasks/pleroma/instance.ex

lib/mix/tasks/pleroma/relay.ex

lib/mix/tasks/pleroma/uploads.ex

lib/mix/tasks/pleroma/user.ex

lib/pleroma/PasswordResetToken.ex

lib/pleroma/activity.ex

lib/pleroma/application.ex

lib/pleroma/captcha/captcha.ex

lib/pleroma/captcha/captcha_service.ex

lib/pleroma/captcha/kocaptcha.ex