Adrian Hopek
		
	
	3ebc391b83
	
	
	Merge branch 'main' into #20-vacation-requests
		
			
			# Conflicts:
#	app/Architecture/Providers/ObserverServiceProvider.php
#	app/Domain/Role.php
#	app/Domain/Rules/ApprovedVacationDaysInSameRange.php
#	app/Domain/Rules/DoesNotExceedLimitRule.php
#	app/Domain/Rules/MinimumOneVacationDayRule.php
#	app/Domain/Rules/PendingVacationRequestInSameRange.php
#	app/Domain/Rules/UsedVacationDaysInSameRange.php
#	app/Domain/Rules/VacationRequestRule.php
#	app/Domain/VacationRequestState.php
#	app/Domain/VacationRequestStateManager.php
#	app/Domain/VacationRequestValidator.php
#	app/Domain/VacationType.php
#	app/Domain/VacationTypeConfigRetriever.php
#	app/Eloquent/Models/User.php
#	app/Infrastructure/Http/Controllers/UserController.php
#	app/Infrastructure/Http/Kernel.php
#	app/Infrastructure/Http/Requests/UserRequest.php
#	database/factories/UserFactory.php
#	database/seeders/DatabaseSeeder.php
#	routes/web.php
#	tests/Feature/UserTest.php
		
	
 
		2022-02-01 11:35:44 +01:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2022-01-26 12:31:26 +01:00
		 
	
		
			
			
			
			
			
			2022-02-01 11:35:44 +01:00
		 
	
		
			
			
			
			
			
			2022-01-26 12:31:26 +01:00