Merge branch 'develop' into oembed_provider

config/config.md

config/dev.exs

config/test.exs

lib/pleroma/activity.ex

lib/pleroma/emails/mailer.ex

lib/pleroma/emails/user_email.ex

lib/pleroma/plugs/oauth_plug.ex

lib/pleroma/web/common_api/common_api.ex

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

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

lib/pleroma/web/push/push.ex

lib/pleroma/web/push/subscription.ex

lib/pleroma/web/router.ex

...templates/twitter_api/util/password_reset_failed.html.eex

...emplates/twitter_api/util/password_reset_success.html.eex

lib/pleroma/web/twitter_api/controllers/util_controller.ex

lib/pleroma/web/twitter_api/twitter_api.ex

lib/pleroma/web/twitter_api/twitter_api_controller.ex

lib/pleroma/web/twitter_api/views/activity_view.ex

mix.exs