Merge remote-tracking branch 'origin/develop' into pool-usage

docs/Admin-API.md

docs/Pleroma-API.md

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

lib/pleroma/config.ex

lib/pleroma/emails/mailer.ex

lib/pleroma/emails/user_email.ex

lib/pleroma/emoji.ex

lib/pleroma/filter.ex

lib/pleroma/formatter.ex

lib/pleroma/gopher/server.ex

lib/pleroma/html.ex

lib/pleroma/http/connection.ex

lib/pleroma/http/http.ex

lib/pleroma/http/request_builder.ex

lib/pleroma/list.ex