Anders dfd8420270 Merge remote-tracking branch 'origin/master' ... # Conflicts: # skolehjem/app/MenuPlan.php		2020-06-30 12:40:02 +02:00
..
contacts	Various fixes	2020-06-30 11:38:28 +02:00
events	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-30 08:52:20 +02:00
external-links	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp	2020-06-30 08:25:18 +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	Role implementation	2020-06-30 11:49:17 +02:00
menuplans	Edited menuplan - Can now be seen by users	2020-06-30 12:38:02 +02:00
resource-extensions	worked on ResourceExtensionController.php	2020-06-30 10:57:25 +02:00
roles	Fix	2020-06-30 12:01:25 +02:00
root	Removed:	2020-06-25 13:28:51 +02:00
staff	Fixed delete on indexes	2020-06-30 08:23:07 +02:00
users	Fix	2020-06-30 12:13:49 +02:00
washing-machines	Fixes	2020-06-29 10:50:04 +02:00
washing-reservations	Fixed delete on indexes	2020-06-30 08:23:07 +02:00
index.blade.php	Added admin sites	2020-06-15 08:56:21 +02:00