Adrian Hopek 3a1b9862c1 Merge branch 'main' into #62-vacation-request-list-for-approvers ...

# Conflicts:
#	app/Eloquent/Helpers/UserAvatarGenerator.php
#	composer.lock
#	database/factories/VacationRequestActivityFactory.php
#	database/seeders/DatabaseSeeder.php
#	database/seeders/DemoSeeder.php

2022-03-07 10:53:35 +01:00

..

api.php

#43 - vacation summary for employee (#66)

2022-03-03 09:03:17 +01:00

web.php

Merge branch 'main' into #62-vacation-request-list-for-approvers

2022-03-07 10:53:35 +01:00