mastodon/app/javascript/styles
Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +01:00
..
contrast
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
mastodon-light Fix styling of featured tags in light theme (#23252) 2023-01-25 16:28:29 +01:00
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss