diff --git a/config/version.php b/config/version.php index a080340b56..a4396196c5 100644 --- a/config/version.php +++ b/config/version.php @@ -6,5 +6,5 @@ return array ( 'prerelease_version' => '', 'hash_version' => 'g4ab478bb9', 'full_hash' => 'v7.0.13-pre-111-g4ab478bb9', - 'branch' => 'develop', + 'branch' => 'master', ); \ No newline at end of file diff --git a/public/js/build/app.js.LICENSE.txt b/public/js/build/app.js.LICENSE.txt index cb3342c839..931b6a9882 100644 Binary files a/public/js/build/app.js.LICENSE.txt and b/public/js/build/app.js.LICENSE.txt differ diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index baba88b5fb..7fe92303b3 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -236,7 +236,7 @@ @foreach ($show_user->licenses as $license) @php - if ($license->category->getEula()) $eulas[] = $license->category->getEula() + if (($license->category) && ($license->category->getEula())) $eulas[] = $license->category->getEula() @endphp {{ $lcounter }} @@ -294,7 +294,7 @@ @foreach ($show_user->accessories as $accessory) @if ($accessory) @php - if ($accessory->category->getEula()) $eulas[] = $accessory->category->getEula() + if (($accessory->category) && ($accessory->category->getEula())) $eulas[] = $accessory->category->getEula() @endphp {{ $acounter }} @@ -357,7 +357,7 @@ @foreach ($show_user->consumables as $consumable) @if ($consumable) @php - if ($consumable->category->getEula()) $eulas[] = $consumable->category->getEula() + if (($consumable->category) && ($consumable->category->getEula())) $eulas[] = $consumable->category->getEula() @endphp {{ $ccounter }}