Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
contrast
fonts
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
mastodon-light
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss