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

Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.

2022-03-22 17:00:38 +01:00

..

contrast

Fix unreadable placeholder text color in high contrast theme in web UI (#14803)

2020-09-15 09:24:24 +02:00

fonts

Merge branch 'main' into glitch-soc/merge-upstream

2021-10-14 22:14:26 +02:00

mastodon

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-22 17:00:38 +01:00

mastodon-light

Fix edit history dropdown and modal in light theme (#17740)

2022-03-10 17:59:23 +01:00

application.scss

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

contrast.scss

…

mailer.scss

Add notifications for statuses deleted by moderators (#17204)

2022-01-17 09:41:33 +01:00

mastodon-light.scss

…

win95.scss

…