vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
 Conflicts:
	skolehjem/resources/views/app/layout/base.blade.php
This commit is contained in:
frederikpyt
2020-07-28 14:30:37 +02:00
parent c4e4d64014 63f2cc31d9
commit fd2184c654
17 changed files with 158 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/routes/web.php
+1 -1
View File
@@ -42,8 +42,8 @@ Route::get("/washing-reservationsapi", "WashingReservationController@api")->name
Route::resource("contacts", "ContactController");
Route::resource("menu-plans", "MenuPlanController");
Route::resource("users", "UserController");
//Route::resource("staff", "StaffController");
Route::resource("events", "EventController");
Route::resource("userevents", "UserEventController");
Route::resource("washing-machines", "WashingMachineController");
Route::resource("washing-reservations", "WashingReservationController");
Route::resource("feedbacks", "FeedbackController");