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

added things to external link views and worked in controller

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

delete.blade.php

Added text in external-links. Added admin->menuplans->index Added foreach in admin->washing-machines->index, fixed title in app->vagttelefons->index

2020-06-25 09:04:23 +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

added things to external link views and worked in controller

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

store.blade.php

added things to external link views and worked in controller

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

update.blade.php

added things to external link views and worked in controller

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