Merge branch 'main' into small-changes

# Conflicts:
#	tests/Feature/MonthlyUsageTest.php
#	tests/Feature/VacationCalendarTest.php
#	tests/Feature/VacationRequestTest.php
This commit is contained in:
Adrian Hopek
2022-03-30 09:56:17 +02:00
6 changed files with 128 additions and 26 deletions

View File

@@ -21,11 +21,11 @@
</div>
<div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
<div class="text-sm text-gray-700">
Wyświetlanie
Wyświetlanie od
<span class="font-medium">{{ pagination.from }}</span>
od
<span class="font-medium">{{ pagination.to }}</span>
do
<span class="font-medium">{{ pagination.to }}</span>
z
<span class="font-medium">{{ pagination.total }}</span>
wyników
</div>