Merge branch 'master' into patch-2

.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/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/stream_entries/_status.html.haml

config/application.rb

config/locales/devise.eo.yml

config/locales/doorkeeper.eo.yml

config/locales/en.yml

config/locales/eo.yml

config/locales/simple_form.eo.yml

docs/Running-Mastodon/Administration-guide.md