Claire 05e5db91c7 Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict because one of the removed lines was modified to accomodate for glitch-soc's slightly different build system. Removed the lines as upstream did.		2025-01-21 19:23:25 +01:00
..
contrast	Update CSS color variables to match our latest design system (#31510)	2024-08-20 15:56:44 +00:00
fonts	…
mastodon	Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream	2025-01-21 19:23:25 +01:00
mastodon-light	Change design of edit media modal in web UI (#33516)	2025-01-21 11:34:22 +00:00
application.scss	Add year in review feature to web UI (#32709)	2024-11-05 14:40:07 +00:00
contrast.scss	…
inert.scss	…
mailer.scss	Add terms of service (#33055)	2024-12-09 10:04:46 +00:00
mastodon-light.scss	…
win95.scss	…