Merge branch 'dev/m6_robert' into dev/m6_safak

# Conflicts: # M6/emensamobile/resources/views/main/index.blade.php
2024-01-19 14:49:44 +01:00
parent 6155f81409 5756f2b7d5
commit 650972d246
12 changed files with 1424 additions and 1132 deletions
--- a/M6/emensamobile/app/Models/Benutzer.php
+++ b/M6/emensamobile/app/Models/Benutzer.php
@@ -40,6 +40,7 @@ class Benutzer extends Model
            session(["login" => 1]);
            session(["name" => $row->name]);
            session(["email" => $row->email]);
+            session(["benutzer_id"=> $row->id]);
            return 1;
        } else {