Claire 954e052b07 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/media_attachment.rb`: Upstream moved hardcoded values around, while in glitch-soc they are configurable. Moved them like upstream, but keeping glitch-soc's ability to configure them through env vars.		2022-02-22 18:06:29 +01: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-02-22 18:06:29 +01:00
mastodon-light	…
application.scss	…
contrast.scss	…
mailer.scss	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
mastodon-light.scss	…
win95.scss	…