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
..
contacts	Fixes	2020-06-29 14:11:15 +02:00
events	worked on event blade files.	2020-06-29 14:48:31 +02:00
external-links	updated Externallink. Should be able to do crud	2020-06-29 09:19:43 +02:00
feedbacks	Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php	2020-06-29 12:56:08 +02:00
layout	Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php	2020-06-29 12:56:08 +02:00
menuplans	Fixes	2020-06-29 13:18:58 +02:00
root	Removed:	2020-06-25 13:28:51 +02:00
staff	Removed unnecessary code from StaffController.php	2020-06-29 14:26:39 +02:00
users	Fixes	2020-06-29 13:55:47 +02:00
washing-machines	Fixes	2020-06-29 10:50:04 +02:00
washing-reservations	Merge remote-tracking branch 'origin/master'	2020-06-29 08:19:55 +02:00
index.blade.php	Added admin sites	2020-06-15 08:56:21 +02:00