Merge branch 'master' into add_more_tests_to_models

.env.production.sample

app/assets/javascripts/components/locales/fi.jsx

app/assets/stylesheets/accounts.scss

app/controllers/remote_follow_controller.rb

app/lib/email_validator.rb

app/lib/feed_manager.rb

app/workers/pubsubhubbub/delivery_worker.rb

config/initializers/blacklists.rb

config/locales/de.yml

config/locales/devise.de.yml

config/locales/doorkeeper.fr.yml

config/locales/fr.yml

config/locales/simple_form.en.yml

config/locales/simple_form.fi.yml

docs/Running-Mastodon/Administration-guide.md

docs/Running-Mastodon/Heroku-guide.md

docs/Running-Mastodon/Production-guide.md

docs/Using-Mastodon/List-of-Mastodon-instances.md

spec/models/user_spec.rb