Merge remote-tracking branch 'origin/develop'

Author: snipe

resources/views/notifications/markdown/asset-acceptance.blade.php

@@ -38,7 +38,7 @@
 | **{{ trans('mail.serial') }}** | {{ $item_serial }} |
 @endif
 @if (isset($admin))
-| **{{ trans('general.checked_out').' '.trans('general.by')}}** | {{ $admin }} |
+| **{{ trans('general.administrator') }}** | {{ $admin }} |
 @endif
 @endcomponent
 

resources/views/reports/custom.blade.php

@@ -672,7 +672,7 @@ class="btn btn-sm btn-warning btn-social btn-block"
 
                     <span data-tooltip="true" title="{{ trans('general.delete') }}">
                         <a href="#"
-                                class="btn btn-sm btn-danger btn-social btn-block"
+                                class="btn btn-sm btn-danger btn-social btn-block delete-asset"
                                 data-toggle="modal"
                                 data-title="{{ trans('general.delete') }}"
                                 data-content="{{ trans('general.delete_confirm', ['item' => $template->name]) }}"