Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

Conflicts: skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php skolehjem/resources/views/admin/users/index.blade.php
2020-06-30 08:25:18 +02:00
parent 4a0840b104 2f22ae275e
commit f638777878
18 changed files with 120 additions and 47 deletions
@@ -19,9 +19,6 @@ class CreateMenuPlans extends Migration
            $table->string('tuesday', 255);
            $table->string('wednesday', 255);
            $table->string('thursday', 255);
-//            $table->string('friday', 255);
-//            $table->string('saturday', 255);
-//            $table->string('sunday', 255);
            $table->timestamps();
            //$table->text('description');
        });