Merge remote-tracking branch 'origin/master'

skolehjem/app/Event.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Event extends Model
+{
+    //
+}

skolehjem/app/Http/Controllers/EventController.php

@@ -49,7 +49,7 @@ class EventController extends Controller
     }
 
     /**
-     * Show the form for editing the specified resource.
+     * Show the form for editing the specified resource.-
      *
      * @param  int  $id
      * @return \Illuminate\Http\Response

skolehjem/app/Resource.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Resource extends Model
+{
+    //
+}

skolehjem/app/ResourceCategory.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ResourceCategory extends Model
+{
+    //
+}

skolehjem/app/ResourceExtension.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ResourceExtension extends Model
+{
+    //
+}