Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.		2023-08-22 18:31:28 +02:00
..
contrast	Fix translate button position (#25807)	2023-07-08 00:12:31 +02:00
fonts	Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream	2023-07-13 13:49:58 +02:00
mastodon	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream	2023-08-22 18:31:28 +02:00
mastodon-light	Fix light theme select option for hashtags (#26311)	2023-08-04 09:41:17 +02:00
application.scss	Add support for incoming rich text (#23913)	2023-03-03 20:19:29 +01:00
contrast.scss
mailer.scss	Update Stylelint (#25819)	2023-07-12 12:31:23 +02:00
mastodon-light.scss
win95.scss	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00