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

Gemfile

Gemfile.lock

app/helpers/settings_helper.rb

...avascript/flavours/glitch/components/status_action_bar.js

...script/flavours/glitch/features/composer/spoiler/index.js

.../flavours/glitch/features/status/components/action_bar.js

app/javascript/mastodon/components/media_gallery.js

app/javascript/mastodon/components/scrollable_list.js

app/javascript/mastodon/components/status.js

app/javascript/mastodon/components/status_action_bar.js

...ript/mastodon/features/compose/components/compose_form.js

...astodon/features/notifications/components/notification.js

...ascript/mastodon/features/status/components/action_bar.js

app/javascript/mastodon/features/status/components/card.js

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

app/javascript/mastodon/locales/ar.json

app/javascript/mastodon/locales/ast.json

app/javascript/mastodon/locales/bg.json

app/javascript/mastodon/locales/ca.json

app/javascript/mastodon/locales/co.json