Claire 48827e1210 Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream ... - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. - `spec/helpers/application_helper_spec.rb`: Minor conflict due to glitch-soc's theming system.		2024-12-01 17:36:49 +01:00
..
contrast	Update CSS color variables to match our latest design system (#31510)	2024-08-20 15:56:44 +00:00
fonts	Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
mastodon	Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream	2024-12-01 17:36:49 +01:00
mastodon-light	Change design of lists in web UI (#32881)	2024-11-21 16:10:04 +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	Use the assets pipeline to load `inert.css` (#28701)	2024-01-12 09:32:45 +00:00
mailer.scss	Mailer layout fixes (#32132)	2024-09-27 19:41:41 +00:00
mastodon-light.scss	…
win95.scss	Fix deprecation warning in win95 theme	2024-07-10 17:46:33 +02:00