From d7222ae1f06298badc1ac6541a08044e117a7507 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 26 Oct 2016 10:12:16 -0700 Subject: [PATCH 1/2] Fix for defaultLoc in asset view --- resources/views/hardware/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index c63ff798b0..ac4f7e09be 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -314,7 +314,7 @@ @endif - @if ($asset->assetloc) + @if ($asset->defaultLoc) {{ trans('admin/hardware/form.default_location') }} From 43404e427d539e749281ecd3b6f3f060a78d3719 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 26 Oct 2016 10:31:13 -0700 Subject: [PATCH 2/2] Bumped version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 4d361a2c48..881b60f6d4 100644 --- a/config/version.php +++ b/config/version.php @@ -1,5 +1,5 @@ 'v3.5.0', - 'hash_version' => 'v3.5.0-30-gf9a06a1', + 'app_version' => 'v3.5.1', + 'hash_version' => 'v3.5.1-2-gd7222ae', );