#23 - collective editing vacation days #26

Merged
Baakoma merged 11 commits from #23-collective-editing-vacation-days into main 2022-01-24 11:28:00 +01:00

11 Commits

Author SHA1 Message Date
Adrian Hopek
36b98e1e67 #23 - cr fix 2022-01-24 11:21:00 +01:00
Adrian Hopek
03af084c04 #23 - fix 2022-01-24 10:41:43 +01:00
Adrian Hopek
f7a9b4f0d1 #23 - fix 2022-01-24 10:34:23 +01:00
Adrian Hopek
ae53b8e3f8 Merge remote-tracking branch 'origin/#23-collective-editing-vacation-days' into #23-collective-editing-vacation-days 2022-01-24 10:28:52 +01:00
Adrian Hopek
62fc1e1ca9 #23 - ecs fix 2022-01-24 10:28:30 +01:00
Adrian Hopek
b4883871c2 #23 - fix 2022-01-24 10:23:08 +01:00
Adrian Hopek
75889a16e6 #23 - wip 2022-01-24 10:19:26 +01:00
Adrian Hopek
b4c6cfe612 Merge remote-tracking branch 'origin/#23-collective-editing-vacation-days' into #23-collective-editing-vacation-days
# Conflicts:
#	routes/web.php
#	tests/FeatureTestCase.php
#	tests/Traits/InteractsWithYearPeriods.php
2022-01-24 08:39:31 +01:00
Adrian Hopek
558dd27fee #23 - wip 2022-01-24 08:38:06 +01:00
Adrian Hopek
5a51f24342 #23 - wip 2022-01-21 15:17:59 +01:00
Adrian Hopek
a62a428781 #23 - wip 2022-01-21 08:45:42 +01:00