Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
assets.rake
auto_annotate_models.rake
branding.rake
db.rake
emojis.rake
glitchsoc.rake
mastodon.rake	Fix default S3_HOSTNAME used in mastodon:setup (#19932)	2022-12-15 16:38:51 +01:00
repo.rake
statistics.rake
tests.rake	Fix pre-4.0 admin action logs (#22091)	2022-12-06 23:38:03 +01:00