Claire ab2f0daa10 Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-security.yml`: Changes were already cherry-picked and adapted in glitch-soc. Kept glitch-soc's version. - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `lib/mastodon/version.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version.		2024-02-24 14:27:43 +01:00
..
contrast	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
fonts	Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
mastodon	Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream	2024-02-24 14:27:43 +01:00
mastodon-light	Change onboarding prompt to follow suggestions carousel in web UI (#28878)	2024-02-01 13:37:04 +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	Fix banner image not showing in follow emails (#28814)	2024-01-19 09:23:59 +00:00
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00