Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.		2022-12-07 09:03:42 +01:00
..
contrast	Fix wrong colors in the high-contrast theme (#19708)	2022-11-04 02:28:14 +01:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-07 09:03:42 +01:00
mastodon-light	Fix color of the “No description added“ media upload warning on light theme (#20328)	2022-11-10 14:21:31 +01:00
application.scss	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	2022-04-06 20:58:12 +02:00
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00