Merge branch 'main' into states

# Conflicts:
#	app/Domain/CalendarGenerator.php
#	app/Domain/VacationRequestStateManager.php
#	app/Eloquent/Models/VacationRequest.php
#	app/Eloquent/Observers/VacationRequestObserver.php
#	composer.json
#	composer.lock
#	tests/Feature/VacationRequestTest.php
This commit is contained in:
Adrian Hopek
2022-02-24 09:38:50 +01:00
52 changed files with 2572 additions and 155 deletions

View File

@@ -19,7 +19,8 @@
"laravel/tinker": "^2.5",
"lasserafn/php-initial-avatar-generator": "^4.2",
"spatie/laravel-google-calendar": "^3.5",
"spatie/laravel-model-states": "^2.1"
"spatie/laravel-model-states": "^2.1",
"maatwebsite/excel": "^3.1"
},
"require-dev": {
"blumilksoftware/codestyle": "^0.9.0",