Merge branch 'develop' into feature/multiple-users-force-password-reset

CHANGELOG.md

config/config.exs

lib/pleroma/bbs/handler.ex

lib/pleroma/html.ex

lib/pleroma/moderation_log.ex

lib/pleroma/user.ex

lib/pleroma/user/query.ex

lib/pleroma/user/search.ex

lib/pleroma/web/activity_pub/activity_pub.ex

lib/pleroma/web/activity_pub/relay.ex

lib/pleroma/web/activity_pub/utils.ex

lib/pleroma/web/admin_api/admin_api_controller.ex

lib/pleroma/web/admin_api/report.ex

lib/pleroma/web/mastodon_api/views/conversation_view.ex

lib/pleroma/web/mastodon_api/views/status_view.ex

lib/pleroma/web/rel_me.ex

lib/pleroma/web/streamer/worker.ex

mix.exs

mix.lock

.../repo/migrations/20190414125034_migrate_old_bookmarks.exs