Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.

2023-04-22 10:06:11 +02: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-04-22 10:06:11 +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

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

…

win95.scss

Update win95 style from cybre.space

2022-04-27 23:05:24 +02:00