Merge branch 'master' into develop

2017-07-11 13:26:38 -05:00
parent 8999e8745e 098b8a4883
commit d0ce75926f
12 changed files with 66 additions and 38 deletions
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -58,7 +58,7 @@ class RegisterController extends Controller
     * Create a new user instance after a valid registration.
     *
     * @param  array  $data
-     * @return User
+     * @return \App\User
     */
    protected function create(array $data)
    {