David Yip 1253279feb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb		2018-01-21 13:36:10 -06:00
..
confirmations_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-21 13:36:10 -06:00
recovery_codes_controller.rb	…