Merge branch 'main' into #48-deployment

Browse Source

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

...

This commit is contained in:

Adrian Hopek 2022-03-04 09:29:18 +01:00

parent ecae457c1f 3d9726039c

commit 1b0485aad9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available