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		6 years ago
..
applications	Remove empty strings (#5732)	7 years ago
deletes	Fix autocomplete option in haml files (#4438)	7 years ago
exports	Add hint about 7 day cooldown for archive takeout (#7375)	6 years ago
flavours	Don't show skins selector when there's only one (#256)	6 years ago
follower_domains	Scrollable tables in settings pages (#4857)	7 years ago
imports	Optimize user setting page for mobile browser (#1924)	7 years ago
keyword_mutes	Override Action View name inference in settings/keyword_mutes.	7 years ago
migrations	Add UI for setting up account migration (#5832)	7 years ago
notifications	Add option to block direct messages from people you don't follow (#5669)	7 years ago
preferences	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
profiles	Merge branch 'master' into glitch-soc/master	6 years ago
shared	2FA controller cleanup (#2296)	7 years ago
two_factor_authentication	Fix autocomplete option in haml files (#4438)	7 years ago
two_factor_authentications	Fix autocomplete option in haml files (#4438)	7 years ago