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
..
exports
two_factor_authentication
applications_controller_spec.rb
deletes_controller_spec.rb
exports_controller_spec.rb
flavours_controller_spec.rb
follower_domains_controller_spec.rb
imports_controller_spec.rb	Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)	2017-06-19 01:51:04 +02:00
keyword_mutes_controller_spec.rb
notifications_controller_spec.rb
preferences_controller_spec.rb
profiles_controller_spec.rb
two_factor_authentications_controller_spec.rb