]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Mon, 25 Oct 2021 18:28:51 +0000 (20:28 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Mon, 25 Oct 2021 18:28:51 +0000 (20:28 +0200)
commite855df149bd2f19729af48cd5f452fa3972273f8
tree4d9dab4fd4568f67b07642db61a2f382e8b1dcc0
parentc647fa99cab9b9db81d36223cf2c2c27e065b648
parent5ba46952af87e42a64962a34f7ec43bc710bdcaf
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.
12 files changed:
.env.production.sample
Gemfile
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
config/routes.rb
package.json
spec/models/concerns/account_interactions_spec.rb
yarn.lock