mastodon/app/javascript/styles
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
contrast
…
fonts
…
mastodon
…
mastodon-light
…
application.scss
…
contrast.scss
…
mailer.scss
…
mastodon-light.scss
…
win95.scss
…