You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip c816701550 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml		6 years ago
..
_mixins.scss	Restore vanilla components	7 years ago
about.scss	Separate high contrast theme (#7213)	7 years ago
accounts.scss	Separate high contrast theme (#7213)	7 years ago
admin.scss	Separate high contrast theme (#7213)	7 years ago
basics.scss	Add color variables of texts for better accesibility (#7125)	7 years ago
boost.scss	Add color variables of texts for better accesibility (#7125)	7 years ago
compact_header.scss	Separate high contrast theme (#7213)	7 years ago
components.scss	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
containers.scss	Separate high contrast theme (#7213)	7 years ago
emoji_picker.scss	Separate high contrast theme (#7213)	7 years ago
footer.scss	Add color variables of texts for better accesibility (#7125)	7 years ago
forms.scss	Separate high contrast theme (#7213)	7 years ago
landing_strip.scss	Separate high contrast theme (#7213)	7 years ago
lists.scss	Restore vanilla components	7 years ago
modal.scss	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
reset.scss	Fix webkit scrollbars (#7191)	7 years ago
rtl.scss	Fix #6757: Adjust RTL styles for landing page (#6768)	7 years ago
stream_entries.scss	Separate high contrast theme (#7213)	7 years ago
tables.scss	Improve report layout (#7188)	7 years ago
variables.scss	Separate high contrast theme (#7213)	7 years ago