frederikpyt 5c871c3fb7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master ... Conflicts: skolehjem/app/Http/Controllers/MenuPlanController.php		2020-08-12 15:28:15 +02:00
..
AboutController.php	v0.8.4b - Made about pages	2020-08-12 13:08:47 +02:00
ContactController.php	…
Controller.php	…
EventController.php	v0.9.0 - Added individual `Read more` buttons on news.index	2020-08-12 15:17:48 +02:00
FeedbackController.php	…
GuideController.php	v0.9.0 - Added individual `Read more` buttons on news.index	2020-08-12 15:17:48 +02:00
LocationController.php	Merge pull request #3 from sebathefox/Multi-language	2020-08-07 08:53:29 +02:00
MenuPlanController.php	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-08-12 15:28:15 +02:00
NewsController.php	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-08-12 15:28:15 +02:00
NewsTypeController.php	v0.9.0 - Added individual `Read more` buttons on news.index	2020-08-12 15:17:48 +02:00
PermissionController.php	…
PhoneController.php	…
ResourceCategoryController.php	…
ResourceController.php	v0.8.0 - Fixed ResourceController.php	2020-08-12 10:44:54 +02:00
ResourceExtensionController.php	…
RolesController.php	…
RootController.php	…
SettingsController.php	v0.7.0 - Settings tab	2020-08-11 12:37:31 +02:00
UserController.php	v0.8.2 - Fixed user profile pic upload	2020-08-12 11:15:08 +02:00
UserEventController.php	v0.9.0 - Added individual `Read more` buttons on news.index	2020-08-12 15:17:48 +02:00
WashingMachineController.php	…
WashingReservationController.php	Merge pull request #3 from sebathefox/Multi-language	2020-08-07 08:53:29 +02:00