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	…
navmenu	…
sites	…
app.js	…
bootstrap.js	…
date.js	…