]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Fri, 11 Feb 2022 20:53:20 +0000 (21:53 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Fri, 11 Feb 2022 20:53:20 +0000 (21:53 +0100)
commit51cad4f7fba199cdcda3ba18b68a25312e21c256
tree15e40a919e3c7984db95e2be5a21098b0a086886
parent776e337b8d2aa66440bc4565617b5440ca781e1a
parentd0fcf07436d158bcac2617d076a83d0aa49c39e6
Merge branch 'main' into glitch-soc/merge-upstream
12 files changed:
Gemfile.lock
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/javascript/styles/mastodon/admin.scss
app/services/remove_status_service.rb
app/views/admin/reports/show.html.haml
config/routes.rb
package.json
spec/models/status_spec.rb
yarn.lock