Merge branch 'develop' into feature/digest-email

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
Simple merge

diff --cc config/test.exs
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/user/info.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/notification_test.exs
Simple merge

diff --cc test/user_test.exs
Simple merge