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

app/Http/Resources/UserResource.php

@@ -25,6 +25,7 @@ class UserResource extends JsonResource
                     'stripe_customer' => is_null($this->stripe_id) ? false : true,
                     'email' => is_demo() ? obfuscate_email($this->email) : $this->email,
                     'role' => $this->role,
+                    'two_factor_authentication' => $this->two_factor_secret ? true : false,
                     'folders' => $this->folder_tree,
                     'storage' => $this->storage,
                     'created_at_formatted' => format_date($this->created_at, '%d. %B. %Y'),