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
..
contrast	…
fonts	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
mastodon-light	…
application.scss	…
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…