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

2022-02-16 09:33:15 +01:00
parent 3c499e8be3 026dd87a44
commit db4914392f
10 changed files with 660 additions and 7 deletions
--- a/app/Eloquent/Models/Vacation.php
+++ b/app/Eloquent/Models/Vacation.php
@@ -12,6 +12,7 @@ use Illuminate\Support\Carbon;
 /**
 * @property int $id
 * @property Carbon $date
+ * @property string $event_id
 * @property User $user
 * @property VacationRequest $vacationRequest
 * @property YearPeriod $yearPeriod