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

..

create.blade.php

Kinda Tryna fix

2020-06-26 13:11:24 +02:00

delete.blade.php

(Maybe) Fixed Menuplans

2020-06-25 13:01:53 +02:00

edit.blade.php

added things to external link views and worked in controller

2020-06-26 13:56:28 +02:00

index.blade.php

Fixed Vector 0x01

2020-06-26 13:17:18 +02:00

show.blade.php

Working on MenuPlanController.php

2020-06-26 13:55:04 +02:00

store.blade.php

idk kev

2020-06-25 18:43:46 +02:00

update.blade.php

Added 2 more pages to Menuplans - Edited Href in Menuplans, Users & Washing-Machines

2020-06-25 08:12:53 +02:00