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 e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		7 years ago
..
_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	…