Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

# Conflicts:
#	app/Support/Http/Controllers/PeriodOverview.php
This commit is contained in:
James Cole
2025-09-27 05:32:41 +02:00
5 changed files with 125 additions and 127 deletions

View File

@@ -9,7 +9,6 @@ use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Database\Eloquent\SoftDeletes;
class PeriodStatistic extends Model
{
@@ -20,8 +19,8 @@ class PeriodStatistic extends Model
return [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'start' => SeparateTimezoneCaster::class,
'end' => SeparateTimezoneCaster::class,
'start' => SeparateTimezoneCaster::class,
'end' => SeparateTimezoneCaster::class,
];
}