Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2020-10-22 20:09:16 -07:00
commit e65269e9c7

View file

@ -39,7 +39,6 @@
data-pagination="true"
data-id-table="requestedAssets"
data-cookie-id-table="requestedAssets"
data-url="{{ route('api.consumables.index') }}"
data-export-options='{
"fileName": "export-assetrequests-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]