Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2023-01-18 17:38:11 +01:00
..
contrast
fonts
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
mastodon-light	Fix dropdown menu positions when scrolling (#22916)	2023-01-11 21:58:46 +01:00
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss