Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields		2018-06-21 20:49:57 +02:00
..
_mixins.scss	…
about.scss	…
accounts.scss	…
admin.scss	…
basics.scss	…
boost.scss	…
compact_header.scss	…
components.scss	…
containers.scss	…
emoji_picker.scss	…
footer.scss	…
forms.scss	…
landing_strip.scss	…
lists.scss	…
modal.scss	…
reset.scss	…
rtl.scss	…
stream_entries.scss	…
tables.scss	…
variables.scss	…