mastodon/app/javascript/styles/mastodon
Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
..
_mixins.scss
about.scss
accessibility.scss
accounts.scss
admin.scss
basics.scss
boost.scss
compact_header.scss
components.scss Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +02:00
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