frederikpyt 4c2b58f33b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ...

 Conflicts:

	skolehjem/resources/views/admin/events/create.blade.php

2020-08-07 09:49:31 +02:00

..

ContactController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

Controller.php

Initial Commit

2020-06-08 10:04:45 +02:00

EventController.php

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

2020-08-07 09:49:31 +02:00

FeedbackController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

GuideController.php

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

2020-08-07 09:49:31 +02:00

LocationController.php

Merge pull request #3 from sebathefox/Multi-language

2020-08-07 08:53:29 +02:00

MenuPlanController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

NewsController.php

v0.5.5 - Added news on the admin panel

2020-08-06 12:21:19 +02:00

PermissionController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

PhoneController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

ResourceCategoryController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

ResourceController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

ResourceExtensionController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

RolesController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

RootController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

UserController.php

Merge pull request #3 from sebathefox/Multi-language

2020-08-07 08:53:29 +02:00

UserEventController.php

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

2020-08-07 09:49:31 +02:00

WashingMachineController.php

v0.5.7 - Made multi language option

2020-08-06 15:31:38 +02:00

WashingReservationController.php

Merge pull request #3 from sebathefox/Multi-language

2020-08-07 08:53:29 +02:00