You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/javascript/styles
Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.
5 years ago
..
contrast Fix sass-lint config (#10982) 6 years ago
fonts Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
mastodon-light Fix direct visibility style for light theme (#14727) 5 years ago
application.scss Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 6 years ago
contrast.scss
mailer.scss Add option to include reported statuses in warning e-mail (#11639) 6 years ago
mastodon-light.scss
win95.scss Fix syntax errors in win95 SCSS file 7 years ago