DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
snipe 2025-02-24 23:06:46 +00:00
parent c79ff49c85 ed46a757fa
commit b395c9130a
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/LocationsController.php
View file

@ -100,7 +100,7 @@ class LocationsController extends Controller
public function edit(Location $location) : View | RedirectResponse
{
$this->authorize('update', Location::class);
return view('locations/edit');
return view('locations/edit')->with('item', $location);
}
/**

14
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v8.0.0-pre',
'full_app_version' => 'v8.0.0-pre - build 16501-gca11efd3ee',
'build_version' => '16501',
'app_version' => 'v8.0.0',
'full_app_version' => 'v8.0.0 - build 16962-g982cfeca32',
'build_version' => '16962',
'prerelease_version' => '',
'hash_version' => 'gca11efd3ee',
'full_hash' => 'v8.0.0-pre-447-gca11efd3ee',
'branch' => 'develop',
);
'hash_version' => 'g982cfeca32',
'full_hash' => 'v8.0.0-172-g982cfeca32',
'branch' => 'master',
);