mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 02:36:28 +00:00 
			
		
		
		
	Auto commit for release 'v6.2.0-alpha.2' on 2025-01-19
This commit is contained in:
		| @@ -42,7 +42,6 @@ class EditController extends Controller | ||||
|         $mainTitleIcon = 'fa-book'; | ||||
|         app('log')->debug(sprintf('Now at %s', __METHOD__)); | ||||
| 
 | ||||
|         return view('administrations.edit')->with(compact('title', 'subTitle', 'mainTitleIcon')) | ||||
|         ; | ||||
|         return view('administrations.edit')->with(compact('title', 'subTitle', 'mainTitleIcon')); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -159,7 +159,7 @@ class InterestingMessage | ||||
|         /** @var User $user */ | ||||
|         $user        = auth()->user(); | ||||
| 
 | ||||
|         /** @var UserGroup|null $userGroup */ | ||||
|         /** @var null|UserGroup $userGroup */ | ||||
|         $userGroup   = UserGroup::find($userGroupId); | ||||
|         $valid       = false; | ||||
|         $memberships = $user->groupMemberships()->get(); | ||||
|   | ||||
| @@ -40,7 +40,7 @@ class CurrencyTransformer extends AbstractTransformer | ||||
|             'id'             => $currency->id, | ||||
|             'created_at'     => $currency->created_at->toAtomString(), | ||||
|             'updated_at'     => $currency->updated_at->toAtomString(), | ||||
|             'native'        => $currency->userGroupNative, | ||||
|             'native'         => $currency->userGroupNative, | ||||
|             'default'        => $currency->userGroupNative, | ||||
|             'enabled'        => $currency->userGroupEnabled, | ||||
|             'name'           => $currency->name, | ||||
|   | ||||
| @@ -46,7 +46,7 @@ class CurrencyTransformer extends AbstractTransformer | ||||
|             'id'             => $currency->id, | ||||
|             'created_at'     => $currency->created_at->toAtomString(), | ||||
|             'updated_at'     => $currency->updated_at->toAtomString(), | ||||
|             'native'        => $currency->userGroupNative, | ||||
|             'native'         => $currency->userGroupNative, | ||||
|             'default'        => $currency->userGroupNative, | ||||
|             'enabled'        => $currency->userGroupEnabled, | ||||
|             'name'           => $currency->name, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user