kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 13:16:31 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	app/Http/Controllers/Transaction/MassController.php
This commit is contained in:
James Cole
2026-03-09 20:39:35 +01:00
parent 28ff0a8423 f9b7149fc7
commit 4222d8ffdd
30 changed files with 159 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Admin/UserController.php
View File

@@ -34,7 +34,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Facades\FireflyConfig;
use FireflyIII\Support\Facades\Preferences;
use FireflyIII\User;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;