Claire 83480df820 Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream added `<s>` to the list of allowed tags, the conflict is because we have a different list of allowed tags. Added `<s>` like upstream did.		2024-08-12 17:46:24 +02: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 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream	2024-08-12 17:46:24 +02:00
mastodon-light	Fix account header avatar border (#31373)	2024-08-11 21:32:22 +00:00
application.scss	Change icons in web UI (#27385)	2023-10-24 17:45:08 +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