Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ...

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.

2023-08-13 18:47:15 +02:00

..

contrast

…

fonts

…

mastodon

…

mastodon-light

…

application.scss

…

contrast.scss

…

mailer.scss

…

mastodon-light.scss

…

win95.scss

…