Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream ...

Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.

2023-06-10 16:22:14 +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 '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

2023-06-10 16:22:14 +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

…