Merge branch 'master' into patch-4

.env.production.sample

Dockerfile

app/assets/javascripts/components/containers/mastodon.jsx

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

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

app/assets/stylesheets/components.scss

app/controllers/application_controller.rb

app/controllers/concerns/localized.rb

app/controllers/oauth/authorizations_controller.rb

app/controllers/oauth/authorized_applications_controller.rb

app/helpers/settings_helper.rb

app/helpers/stream_entries_helper.rb

app/lib/atom_serializer.rb

app/models/account.rb

app/models/status.rb

app/services/post_status_service.rb

app/views/oauth/authorized_applications/index.html.haml

app/views/stream_entries/_status.html.haml

app/views/user_mailer/confirmation_instructions.fi.html.erb

app/views/user_mailer/confirmation_instructions.fi.text.erb