Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into fe_fix

backend/app/Http/Controllers/Api/FathersController.php

@@ -142,7 +142,7 @@ class FathersController extends Controller {
 
     public function checkRegisterMain (Request $r) {
         // トークンの確認
-        if (null === ($get = EmailActivation::select('ttl')where('token', $r->token)->first())) {
+        if (null === ($get = EmailActivation::select('ttl')->where('token', $r->token)->first())) {
             return ['status_code' => 400, 'error_messages' => ['不正な登録トークン。']];
         }
 
@@ -402,7 +402,7 @@ class FathersController extends Controller {
             if (request()->route()->action['as'] == 'pip') {
                 $login_user_datum = $father->toArray();
                 unset($login_user_datum['password']);
-    
+
                 // セッションに保存する
                 session()->put('fathers', $login_user_datum);
             }