Adrian Hopek 1ec711297f Merge branch 'main' into #19-year-period ...

# Conflicts:
#	database/seeders/DatabaseSeeder.php

2022-01-19 10:56:32 +01:00

..

User.php

#4 - users CRUD (#24)

2022-01-19 10:55:10 +01:00

YearPeriod.php

#19 - year periods

2022-01-19 10:44:03 +01:00