Claire 0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Upstream added a test for a new attribute, next to a line we modified in glitch-soc because of a different default value. Updated as upstream's did, keeping glitch-soc's default value.		2024-08-21 18:44:21 +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 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream	2024-08-21 18:44:21 +02:00
mastodon-light	Update CSS color variables to match our latest design system (#31510)	2024-08-20 15:56:44 +00:00
application.scss	Change icons in web UI (#27385)	2023-10-24 17:45:08 +00:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
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	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Fix deprecation warning in win95 theme	2024-07-10 17:46:33 +02:00