- small changes #98

Merged
Baakoma merged 8 commits from small-changes into main 2022-03-30 10:33:19 +02:00

8 Commits

Author SHA1 Message Date
Adrian Hopek
a6bf73e68c fix 2022-03-30 10:20:22 +02:00
Adrian Hopek
0c57f09dcd Update resources/js/Shared/MainMenu.vue
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-03-30 10:15:45 +02:00
Adrian Hopek
a43706f98b Merge branch 'main' into small-changes
# Conflicts:
#	tests/Feature/MonthlyUsageTest.php
#	tests/Feature/VacationCalendarTest.php
#	tests/Feature/VacationRequestTest.php
2022-03-30 09:59:53 +02:00
Adrian Hopek
0f462ffee1 Merge branch 'permissions-tests' into small-changes 2022-03-30 09:08:25 +02:00
Adrian Hopek
3c43f6814d wip 2022-03-29 15:14:26 +02:00
Adrian Hopek
93f0151b14 wip 2022-03-29 13:42:01 +02:00
EwelinaLasowy
435158f426 - cr fix 2022-03-29 10:59:48 +02:00
EwelinaLasowy
c09a1e664a - added some test 2022-03-29 10:40:51 +02:00