Claire aaace9f1db Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CHANGELOG.md`: Upstream added newlines. Conflicts are because the CHANGELOG was independently merged from 3.4.6 on last security update. Took upstream's version. - `app/helpers/context_helper.rb`: Conflicts because of extra vocabulary in glitch-soc. The conflicts were actually handled in last security merge. Kept our version.		2022-02-06 15:34:42 +01:00
..
build-image.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-06 15:34:42 +01:00
check-i18n.yml	Ruby 3.0.2 Upgrade (#16982)	2021-11-18 21:59:57 +01:00