Sebastian Davaris 4061b590cb Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/resources/views/admin/menuplans/edit.blade.php skolehjem/resources/views/admin/menuplans/index.blade.php skolehjem/resources/views/admin/menuplans/update.blade.php		2020-06-29 08:32:52 +02:00
..
events	Removed ID From all admin sites.	2020-06-26 12:17:46 +02:00
external-links	changed route name and table data to show correct info	2020-06-29 08:30:31 +02:00
layout	Fixes	2020-06-29 08:13:53 +02:00
menuplans	Working on MenuPlanController.php	2020-06-29 08:31:36 +02:00
root	Removed:	2020-06-25 13:28:51 +02:00
users	Removed ID From all admin sites.	2020-06-26 12:17:46 +02:00
washing-machines	Removed ID From all admin sites.	2020-06-26 12:17:46 +02:00
washing-reservations	Fixes	2020-06-29 08:13:53 +02:00
index.blade.php	Added admin sites	2020-06-15 08:56:21 +02:00