EwelinaLasowy 3c499e8be3 Merge branch 'main' into #41-email-notifications ...

# Conflicts:
#	app/Domain/CalendarGenerator.php
#	app/Domain/Enums/VacationRequestState.php
#	app/Domain/VacationRequestStateManager.php
#	resources/js/Composables/statusInfo.js
#	resources/js/Pages/Calendar.vue
#	resources/js/Shared/MainMenu.vue
#	resources/lang/pl.json
#	tests/Feature/VacationRequestTest.php
#	tests/Unit/VacationRequestStatesTest.php

2022-02-16 08:53:55 +01:00

..

Layout

#42 - global notifications (#50)

2022-02-16 08:43:12 +01:00

Activity.vue

#22 - vacation calendar (#51)

2022-02-15 15:08:26 +01:00

MainMenu.vue

Merge branch 'main' into #41-email-notifications

2022-02-16 08:53:55 +01:00

Status.vue

#22 - vacation calendar (#51)

2022-02-15 15:08:26 +01:00