Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.		2022-05-11 09:37:48 +02:00
..
assets.rake
auto_annotate_models.rake
db.rake	Fix null values being included in some indexes (#17711)	2022-03-12 08:12:57 +01:00
emojis.rake	Fix light-mode emoji borders. (#18131)	2022-04-29 19:23:03 +02:00
glitchsoc.rake
mastodon.rake	Fix redis configuration not being changed by mastodon:setup (#18383)	2022-05-09 23:19:11 +02:00
repo.rake
statistics.rake
tests.rake	Fix instance actor being incorrectly created when running migrations (#18109)	2022-04-26 21:22:09 +02:00