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
..
bookings	Working on calendar.js some more..	2020-06-26 10:52:26 +02:00
contact	Updated Contact	2020-06-29 09:03:24 +02:00
events	Fixed EventController to go to Events instead of bookings	2020-06-26 08:56:18 +02:00
layout	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-29 10:15:56 +02:00
menuplans	Moved files	2020-06-24 09:25:59 +02:00
root	Fixes	2020-06-29 09:26:07 +02:00
users	Fixes	2020-06-29 09:28:57 +02:00
vagttelefons	Fixed mistakes	2020-06-25 15:11:59 +02:00
washing-reservations	Finished calendar.js (for now)	2020-06-26 13:07:57 +02:00