]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Wed, 23 Feb 2022 17:13:12 +0000 (18:13 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Wed, 23 Feb 2022 17:13:12 +0000 (18:13 +0100)
commit3d25fe042679e7f5b9095983feb22f46e24c3033
tree18b57e7abf4f3edf55f057efd6eb47da698bf0f6
parent2c8615fbf8f8085eb836733b27b33c9522c29c71
parent0db101ede2eb9f8869932135785b0d83cd05560e
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.
.github/workflows/build-image.yml
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/lib/feed_manager.rb
config/i18n-tasks.yml