Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.		2022-11-14 08:35:55 +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	Copied Spaces support from packer .rake (#20573)	2022-11-13 20:58:40 +01:00
repo.rake	…
statistics.rake	…
tests.rake	Fix admin action logs page (#19649)	2022-11-03 16:06:42 +01:00