Vedde 578dd8d522 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/Http/Controllers/MenuPlanController.php # skolehjem/resources/views/admin/external-links/index.blade.php		2020-06-26 13:56:47 +02:00
..
CalendarController.php	…
CalendarDateController.php	…
Controller.php	…
EventController.php	Fixed EventController to go to Events instead of bookings	2020-06-26 08:56:18 +02:00
ExternalLinkController.php	added things to external link views and worked in controller	2020-06-26 13:56:28 +02:00
FeedbackController.php	Updated Controllers	2020-06-25 12:40:26 +02:00
MenuPlanController.php	added things to external link views and worked in controller	2020-06-26 13:56:28 +02:00
PermissionController.php	Updated Controllers	2020-06-25 12:40:26 +02:00
ResourceCategoryController.php	…
ResourceController.php	…
ResourceExtensionController.php	…
RootController.php	…
UserController.php	updated menuplan controller	2020-06-25 10:34:10 +02:00
WashingMachineController.php	…
WashingReservationController.php	Removed:	2020-06-25 13:28:51 +02:00