Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ...

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.

2023-06-10 16:48:01 +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 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream

2023-06-10 16:48:01 +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