You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire aa832d623a 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.		3 years ago
..
build-image.yml	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
check-i18n.yml	Ruby 3.0.2 Upgrade (#16982)	3 years ago