Merge remote-tracking branch 'origin/main' into main

# Conflicts: # Backend/Main.php
2021-03-04 09:20:23 +01:00
parent 119732114f 56d53d35de
commit d27996542f
4 changed files with 9 additions and 3 deletions
@@ -6,5 +6,3 @@ require "../bootstrap.php";
 $gameJam = GameJam::firstOrCreate([
    'name' => "First game jam ever!", 'startTime' => "2021-03-03T12:40", 'endTime' => "2021-04-03T12:40", 'description' => "Det her et en beskrivelse"
 ]);
-
-