Sebastian Davaris f638777878 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php skolehjem/resources/views/admin/users/index.blade.php		2020-06-30 08:25:18 +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	updated Externallink. Should be able to do crud	2020-06-29 09:19:43 +02:00
index.blade.php	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-30 08:25:18 +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	updated Externallink. Should be able to do crud	2020-06-29 09:19:43 +02:00