This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript/styles
Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.
2021-02-12 10:28:32 +01:00
..
contrast
fonts
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01:00
mastodon-light
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss