Vedde a3209bc422 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ...

 Conflicts:

	skolehjem/app/Http/Controllers/ContactController.php

2020-06-29 14:48:53 +02:00

..

bookings

Working on calendar.js some more..

2020-06-26 10:52:26 +02:00

contacts

Added feedbacks.index in root->index. Added Feedbacks page to app. Added a send feedback button on contacts->index

2020-06-29 14:08:26 +02:00

events

updated event migration and admin stuff

2020-06-29 12:53:08 +02:00

feedbacks

Added feedbacks.index in root->index. Added Feedbacks page to app. Added a send feedback button on contacts->index

2020-06-29 14:08:26 +02:00

layout

jeg er ikke sikker på hvad der der sket :)

2020-06-29 10:07:42 +02:00

menuplans

Removed Fredag-Søndag in menuplans

2020-06-29 11:09:39 +02:00

root

Added feedbacks.index in root->index. Added Feedbacks page to app. Added a send feedback button on contacts->index

2020-06-29 14:08:26 +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