Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.		2022-01-17 10:45:25 +01:00
..
contrast	Fix unreadable placeholder text color in high contrast theme in web UI (#14803)	2020-09-15 09:24:24 +02:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 22:14:26 +02:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
mastodon-light	Fixing the hero widget (#15926)	2021-03-19 20:23:32 +01:00
application.scss
contrast.scss
mailer.scss	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
mastodon-light.scss
win95.scss