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 ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
7 years ago
..
contrast Fix sass-lint config (#10982) 7 years ago
fonts Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
mastodon-light Fix more issues in the light theme (#10996) 7 years ago
application.scss Add polls (#10111) 7 years ago
contrast.scss Separate high contrast theme (#7213) 8 years ago
mailer.scss Fix sass-lint config (#10982) 7 years ago
mastodon-light.scss More polished light theme (#7620) 8 years ago
win95.scss Fix syntax errors in win95 SCSS file 7 years ago