Merge pull request #578 from ThibG/glitch-soc/merge-upstream

.nvmrc

Aptfile

Dockerfile

app/controllers/admin/relays_controller.rb

app/helpers/stream_entries_helper.rb

app/javascript/core/admin.js

app/javascript/core/common.js

app/javascript/flavours/glitch/packs/common.js

app/javascript/mastodon/actions/domain_blocks.js

app/javascript/mastodon/common.js

app/javascript/mastodon/features/getting_started/index.js

...avascript/mastodon/features/ui/components/image_loader.js

app/javascript/mastodon/initial_state.js

app/javascript/mastodon/locales/cs.json

app/javascript/mastodon/locales/el.json

app/javascript/mastodon/locales/fa.json

app/javascript/mastodon/locales/ja.json

app/javascript/mastodon/locales/nl.json

app/javascript/mastodon/locales/oc.json

app/javascript/mastodon/locales/pt-BR.json