Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.		2024-01-13 12:11:29 +01:00
..
assets.rake	…
auto_annotate_models.rake	…
branding.rake	…
db.rake	…
emojis.rake	Add new emojis from `jdecked/twemoji` 15.0 (#28404)	2024-01-11 16:15:08 +00:00
glitchsoc.rake	…
mastodon.rake	…
repo.rake	…
spec.rake	…
statistics.rake	…
tests.rake	…
webpacker.rake	…