mastodon/app/javascript/styles/mastodon
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
2019-06-10 18:59:53 +02:00
..
_mixins.scss
about.scss
accessibility.scss
accounts.scss
admin.scss
basics.scss
boost.scss
compact_header.scss
components.scss
containers.scss
dashboard.scss
emoji_picker.scss
footer.scss
forms.scss
introduction.scss
lists.scss
modal.scss
polls.scss
reset.scss
rtl.scss
stream_entries.scss
tables.scss
variables.scss
widgets.scss