Claire 665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: An upstream refactor touched lines adjacent to ones modified in glitch-soc. Ported upstream's changes.		2024-09-16 21:08:58 +02: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 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream	2024-09-16 21:08:58 +02:00
mastodon-light	Fix review history and action modal styling (#31864)	2024-09-12 14:18:43 +00:00
application.scss	Change embedded posts to use web UI (#31766)	2024-09-12 09:41:19 +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	New welcome email (#28883)	2024-03-01 12:16:53 +00:00
mastodon-light.scss	…
win95.scss	Fix deprecation warning in win95 theme	2024-07-10 17:46:33 +02:00