Merge remote-tracking branch 'origin/2fa'

# Conflicts:
#	.php-cs-fixer.cache
#	config/language-translations.php
#	public/mix-manifest.json
#	resources/js/views/Auth/SignIn.vue
#	webpack.mix.js

config/fortify.php

@@ -136,8 +136,8 @@ return [
         // Features::emailVerification(),
         Features::updateProfileInformation(),
         //Features::updatePasswords(),
-        /*Features::twoFactorAuthentication([
+        Features::twoFactorAuthentication([
             'confirmPassword' => true,
-        ]),*/
+        ]),
     ],
 ];