Merge branch 'main' into #39-generate-timesheet

# Conflicts:
#	composer.lock
#	resources/lang/pl.json
This commit is contained in:
Adrian Hopek
2022-02-21 12:33:50 +01:00
20 changed files with 696 additions and 2507 deletions

View File

@@ -21,7 +21,6 @@ use Maatwebsite\Excel\Events\AfterSheet;
use PhpOffice\PhpSpreadsheet\Shared\Date;
use PhpOffice\PhpSpreadsheet\Style\Alignment;
use PhpOffice\PhpSpreadsheet\Style\Border;
use PhpOffice\PhpSpreadsheet\Style\Color;
use PhpOffice\PhpSpreadsheet\Style\Fill;
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;