Sebastian Davaris 03c609175d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/resources/views/admin/layout/base.blade.php skolehjem/resources/views/app/layout/base.blade.php skolehjem/routes/web.php		2020-06-29 10:15:56 +02:00
..
calendar	Added button to calendar.js	2020-06-29 10:14:47 +02:00
components	Added Vue	2020-06-09 08:24:20 +02:00
navmenu	Fixes	2020-06-29 09:26:07 +02:00
sites	Fixed mistakes	2020-06-25 15:11:59 +02:00
app.js	Working on calendar.js some more..	2020-06-26 10:52:26 +02:00
bootstrap.js	Removed Vue	2020-06-09 08:38:05 +02:00
date.js	Added Images, fonts, vagttelefon and menuplan	2020-06-11 14:52:15 +02:00