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	Add preference to hide following/followers lists (#7532)	7 years ago
admin.scss	Improvements to toots display in admin view (#7452)	7 years ago
basics.scss	…
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge	7 years ago
containers.scss	Combine similar components into one on public UI (#7458)	7 years ago
emoji_picker.scss	…
footer.scss	Add preference to hide following/followers lists (#7532)	7 years ago
forms.scss	Bot nameplates (#7391)	7 years ago
landing_strip.scss	…
lists.scss	…
modal.scss	…
reset.scss	…
rtl.scss	…
stream_entries.scss	…
tables.scss	Improvements to toots display in admin view (#7452)	7 years ago
variables.scss	…