Merge branch 'develop' of https://github.com/stanjg/panel into feature/user-specific-language

2018-06-01 15:58:09 +02:00 · 2018-06-01 15:58:09 +02:00 · 3bb9e5e8a8
commit 3bb9e5e8a8
parent 28e34f77b6 d7ab24a8ce
199 changed files with 2390 additions and 1179 deletions
--- a/app/Http/Controllers/Base/SecurityController.php
+++ b/app/Http/Controllers/Base/SecurityController.php
@ -96,7 +96,7 @@ class SecurityController extends Controller
    }

    /**
-     * Verifies that 2FA token recieved is valid and will work on the account.
+     * Verifies that 2FA token received is valid and will work on the account.
     *
     * @param \Illuminate\Http\Request $request
     * @return \Illuminate\Http\Response