Merge branch 'develop' of github.com:snipe/snipe-it into develop

snipe · snipe · commit 5e9740e0b45d · 2016-08-12T17:10:10.000-07:00
diff --git a/resources/views/account/accept-asset.blade.php b/resources/views/account/accept-asset.blade.php
@@ -23,7 +23,7 @@
     <div class="col-md-12">
 
         <h3>
-        Accept {{ $item->name }}</h3>
+        Accept {{ $item->showAssetName() }}</h3>
     </div>
 </div>
 
