Sebastian Davaris 2f0ec75278 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ... Conflicts: skolehjem/routes/web.php		2020-06-10 12:31:11 +02:00
..
CalendarDateController.php	Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.	2020-06-09 09:05:07 +02:00
Controller.php	Initial Commit	2020-06-08 10:04:45 +02:00
EventController.php	added user folder/view	2020-06-10 08:33:06 +02:00
ExternalLinkController.php	Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.	2020-06-09 09:05:07 +02:00
FeedbackController.php	Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.	2020-06-09 09:05:07 +02:00
PermissionController.php	Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.	2020-06-09 09:05:07 +02:00
ResourceCategoryController.php	Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.	2020-06-09 09:05:07 +02:00
ResourceController.php	Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.	2020-06-09 09:05:07 +02:00
ResourceExtensionController.php	Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.	2020-06-09 09:05:07 +02:00
RootController.php	Added first seeder.	2020-06-08 15:08:46 +02:00
UserController.php	Began working on more controllers	2020-06-10 12:30:44 +02:00
WashingMachineController.php	Began working on more controllers	2020-06-10 12:30:44 +02:00
WashingReservationController.php	Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.	2020-06-09 09:05:07 +02:00