Merge branch 'master' into fix-default-locale-regression

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

config/application.rb

config/locales/devise.eo.yml

config/locales/doorkeeper.eo.yml

config/locales/eo.yml

config/locales/simple_form.eo.yml

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