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.
This commit is contained in:
Claire
2022-02-23 18:13:12 +01:00
71 changed files with 522 additions and 176 deletions

View File

@ -62,6 +62,7 @@ ignore_unused:
- 'themes.*'
- 'statuses.attached.*'
- 'move_handler.carry_{mutes,blocks}_over_text'
- 'notification_mailer.*'
ignore_inconsistent_interpolations:
- '*.one'