Claire 3fd3e88b25 Merge branch 'main' into glitch-soc/merge-upstream		2023-01-21 14:58:15 +01:00
..
assets.rake
auto_annotate_models.rake
branding.rake	Fix wrong aspect ratio of logo in icons (#18639)	2022-06-11 20:32:02 +02:00
db.rake
emojis.rake	Add assets from Twemoji 14.0 (#19733)	2022-11-04 16:08:41 +01:00
glitchsoc.rake
mastodon.rake	Add Storj DCS to cloud object storage options (#21929)	2023-01-18 17:47:49 +01:00
repo.rake
statistics.rake
tests.rake	Fix pre-4.0 admin action logs (#22091)	2022-12-06 23:38:03 +01:00