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
..
exports	Remove exports/base controller in favor of shared concern (#3444)	8 years ago
two_factor_authentication	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
applications_controller.rb	Finalized theme loading and stuff	7 years ago
base_controller.rb	Finalized theme loading and stuff	7 years ago
deletes_controller.rb	Prepend check_enabled_deletion to Settings::DeletesController (#229)	7 years ago
exports_controller.rb	Fix data export page error	7 years ago
flavours_controller.rb	Thank you, Officer Murphy	7 years ago
follower_domains_controller.rb	Slightly reduce RAM usage (#7301)	7 years ago
imports_controller.rb	Finalized theme loading and stuff	7 years ago
keyword_mutes_controller.rb	Finalized theme loading and stuff	7 years ago
migrations_controller.rb	Fix migration page style	7 years ago
notifications_controller.rb	Finalized theme loading and stuff	7 years ago
preferences_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
profiles_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
sessions_controller.rb	Finalized theme loading and stuff	7 years ago
two_factor_authentications_controller.rb	Finalized theme loading and stuff	7 years ago