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 1253279feb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb		7 years ago
..
exports	…
two_factor_authentication	…
applications_controller.rb	…
base_controller.rb	…
deletes_controller.rb	…
exports_controller.rb	…
flavours_controller.rb	…
follower_domains_controller.rb	…
imports_controller.rb	…
keyword_mutes_controller.rb	…
migrations_controller.rb	…
notifications_controller.rb	…
preferences_controller.rb	…
profiles_controller.rb	…
sessions_controller.rb	…
two_factor_authentications_controller.rb	…