Merge branch 'master' into glitch-soc/merge-upstream

author Thibaut Girka <thib@sitedethib.com>

Fri, 19 Jul 2019 21:37:41 +0000 (23:37 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Fri, 19 Jul 2019 21:37:41 +0000 (23:37 +0200)
author Thibaut Girka <thib@sitedethib.com>
Fri, 19 Jul 2019 21:37:41 +0000 (23:37 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Fri, 19 Jul 2019 21:37:41 +0000 (23:37 +0200)
diff --cc app/controllers/settings/two_factor_authentication/confirmations_controller.rb
Simple merge
diff --cc app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Fri, 19 Jul 2019 21:37:41 +0000 (23:37 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Fri, 19 Jul 2019 21:37:41 +0000 (23:37 +0200)
		1	2
app/controllers/settings/two_factor_authentication/confirmations_controller.rb	patch \|	diff1 \|	diff2 \|	blob \| history
app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb	patch \|	diff1 \|	diff2 \|	blob \| history