Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy

config/prod.exs

installation/pleroma.nginx

lib/mix/tasks/generate_config.ex

lib/mix/tasks/sample_config.eex

lib/pleroma/application.ex

lib/pleroma/stats.ex

lib/pleroma/user.ex

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

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

lib/pleroma/web/ostatus/ostatus.ex

lib/pleroma/web/router.ex

lib/pleroma/web/templates/twitter_api/util/follow.html.eex

...roma/web/templates/twitter_api/util/follow_login.html.eex

lib/pleroma/web/templates/twitter_api/util/followed.html.eex

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

lib/pleroma/web/twitter_api/twitter_api.ex

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

lib/pleroma/web/web_finger/web_finger.ex

priv/static/static/avi.png

priv/static/static/banner.png