Adrian Hopek 58ef6af1a2 Merge remote-tracking branch 'origin/#20-vacation-requests' into #20-vacation-requests ...

# Conflicts:
#	app/Enums/VacationType.php
#	app/Helpers/Rules/MinimumOneVacationDayRule.php
#	app/Helpers/Rules/PendingVacationRequestInSameRange.php
#	app/Helpers/VacationRequestValidator.php
#	app/Http/Controllers/VacationRequestController.php
#	app/Http/Resources/VacationRequestResource.php
#	app/Models/VacationRequest.php
#	config/sanctum.php
#	database/factories/VacationRequestFactory.php
#	database/migrations/2022_01_26_100039_create_vacation_requests_table.php
#	package-lock.json
#	resources/js/Pages/VacationRequest/Create.vue
#	resources/js/Pages/VacationRequest/Index.vue
#	resources/js/Shared/MainMenu.vue
#	resources/lang/pl.json
#	routes/web.php

2022-02-01 09:24:55 +01:00

4.9 KiB

Raw Blame History

View Raw