Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.		2023-03-22 19:50:11 +01:00
..
contrast	Fix wrong colors in the high-contrast theme (#19708)	2022-11-04 02:28:14 +01:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-13 19:35:35 +01:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-22 19:50:11 +01:00
mastodon-light	Increase contrast of upload progress background (#23836)	2023-02-23 12:58:42 +01:00
application.scss	Add support for incoming rich text (#23913)	2023-03-03 20:19:29 +01:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
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	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00