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

# Conflicts:
#	Backend/Main.php
This commit is contained in:
neerholt
2021-03-04 09:20:23 +01:00
4 changed files with 9 additions and 3 deletions
+1
View File
@@ -0,0 +1 @@
<?php
-2
View File
@@ -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"
]);
+7 -1
View File
@@ -1,9 +1,15 @@
<?php
namespace Backend\Models;
use Illuminate\Database\Eloquent\Model as Eloquent;
class GameJam extends Eloquent{
protected $fillable =[
'name', 'startTime', 'endTime', 'keyWord', 'description'
'name',
'startTime',
'endTime',
'keyWord',
'description'
];
+1
View File
@@ -0,0 +1 @@
<?php