Merge remote-tracking branch 'origin/#4-users-crud' into #4-users-crud

# Conflicts: # app/Enums/FormOfEmployment.php # app/Models/User.php # resources/js/Pages/Users/Index.vue # routes/web.php
2022-01-18 07:40:57 +01:00
parent acf2eba95d df0390134c
commit 13d166ee81
18 changed files with 71 additions and 29 deletions
--- a/routes/web.php
+++ b/routes/web.php
@@ -21,4 +21,4 @@ Route::middleware("guest")->group(function (): void {
        ->name("login.google.start");
    Route::get("login/google/end", [GoogleController::class, "callback"])
        ->name("login.google.end");
-});
+});