mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
b395c9130a
|
@ -100,7 +100,7 @@ class LocationsController extends Controller
|
||||||
public function edit(Location $location) : View | RedirectResponse
|
public function edit(Location $location) : View | RedirectResponse
|
||||||
{
|
{
|
||||||
$this->authorize('update', Location::class);
|
$this->authorize('update', Location::class);
|
||||||
return view('locations/edit');
|
return view('locations/edit')->with('item', $location);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
<?php
|
<?php
|
||||||
return array (
|
return array (
|
||||||
'app_version' => 'v8.0.0-pre',
|
'app_version' => 'v8.0.0',
|
||||||
'full_app_version' => 'v8.0.0-pre - build 16501-gca11efd3ee',
|
'full_app_version' => 'v8.0.0 - build 16962-g982cfeca32',
|
||||||
'build_version' => '16501',
|
'build_version' => '16962',
|
||||||
'prerelease_version' => '',
|
'prerelease_version' => '',
|
||||||
'hash_version' => 'gca11efd3ee',
|
'hash_version' => 'g982cfeca32',
|
||||||
'full_hash' => 'v8.0.0-pre-447-gca11efd3ee',
|
'full_hash' => 'v8.0.0-172-g982cfeca32',
|
||||||
'branch' => 'develop',
|
'branch' => 'master',
|
||||||
);
|
);
|
Loading…
Reference in a new issue