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

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-21 13:36:10 -06:00

applications_controller.rb

…

base_controller.rb

…

deletes_controller.rb

…

exports_controller.rb

…

flavours_controller.rb

Thank you, Officer Murphy

2018-01-10 12:10:43 -06:00

follower_domains_controller.rb

…

imports_controller.rb

…

keyword_mutes_controller.rb

…

migrations_controller.rb

Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)

2017-12-14 21:35:30 +01:00

notifications_controller.rb

…

preferences_controller.rb

…

profiles_controller.rb

…

sessions_controller.rb

…

two_factor_authentications_controller.rb

…