Merge branch 'develop' into fix/formatter-ignore-html-chars

.gitignore

.gitlab-ci.yml

config/config.exs

config/config.md

config/dev.exs

config/test.exs

installation/netbsd/rc.d/pleroma

installation/openbsd/httpd.conf

installation/openbsd/rc.d/pleromad

installation/openbsd/relayd.conf

lib/mix/tasks/pleroma/sample_psql.eex

lib/mix/tasks/pleroma/user.ex

lib/pleroma/application.ex

lib/pleroma/captcha/captcha.ex

lib/pleroma/captcha/captcha_service.ex

lib/pleroma/captcha/kocaptcha.ex

lib/pleroma/plugs/federating_plug.ex

lib/pleroma/plugs/instance_static.ex

lib/pleroma/user.ex

lib/pleroma/user/info.ex