Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2023-01-18 17:38:11 +01:00
..
migrate	…
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-07 09:03:42 +01:00
seeds	Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)	2023-01-18 16:33:03 +01:00
views	…
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-07 09:03:42 +01:00
seeds.rb	…