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 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
6 years ago
..
contrast Fix sass-lint config (#10982) 6 years ago
fonts
mastodon Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
mastodon-light Fix more issues in the light theme (#10996) 6 years ago
application.scss
contrast.scss
mailer.scss Fix sass-lint config (#10982) 6 years ago
mastodon-light.scss
win95.scss