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
..
js	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-29 10:15:56 +02:00
lang/en	Initial Commit	2020-06-08 10:04:45 +02:00
sass	Fixed delete on indexes	2020-06-30 08:23:07 +02:00
views	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-30 08:25:18 +02:00