Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.		2022-05-11 09:37:48 +02:00
..
contrast
fonts
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00
mastodon-light	Fix edit history dropdown and modal in light theme (#17740)	2022-03-10 17:59:23 +01:00
application.scss
contrast.scss
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
win95.scss	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00