Claire 4415005de7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict caused because of minor code style change upstream, while glitch-soc has different code for handling variable maximum chars. Ported the change. - `app/serializers/initial_state_serializer.rb`: Conflict because glitch-soc had two extra attributes where upstream added one. Added upstream's attribute.		2022-05-16 22:29:05 +02:00
..
contrast
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 22:14:26 +02:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 22:29:05 +02:00
mastodon-light	Fix edit history dropdown and modal in light theme (#17740)	2022-03-10 17:59:23 +01:00
application.scss
contrast.scss
mailer.scss	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	2022-04-06 20:58:12 +02:00
mastodon-light.scss
win95.scss	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00