Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.		2023-05-08 15:28:36 +02:00
..
contrast	Fix wrong colors in the high-contrast theme (#19708)	2022-11-04 02:28:14 +01:00
fonts	Fix SCSS linting issues (#2207)	2023-05-07 15:04:59 +02:00
mastodon	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream	2023-05-08 15:28:36 +02:00
mastodon-light	Change "direct message" nomenclature to "private mention" in web UI (#24248)	2023-03-30 15:16:20 +02:00
application.scss	Add support for incoming rich text (#23913)	2023-03-03 20:19:29 +01:00
contrast.scss	…
mailer.scss	Fix SCSS linting issues (#2207)	2023-05-07 15:04:59 +02:00
mastodon-light.scss	…
win95.scss	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00