snipe 43c57c8461 Merge master into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Http/Controllers/BulkAssetModelsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ModalController.php # app/Http/Transformers/GroupsTransformer.php # config/version.php # package-lock.json # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/less/overrides.less # resources/lang/en/admin/hardware/message.php # resources/lang/en/admin/settings/general.php # resources/views/partials/bootstrap-table.blade.php # routes/web.php		2022-01-12 20:51:33 -08:00
..
bootstrap
build	Merge master into develop	2022-01-12 20:51:33 -08:00
dist	Merge master into develop	2022-01-12 20:51:33 -08:00
extensions	Updated more fa icons	2021-09-26 01:11:08 -07:00
locale
plugins	Updated more fa icons	2021-09-26 01:11:08 -07:00
bootstrap-table-locale-all.js
bootstrap-table-locale-all.min.js
bootstrap-table.css
bootstrap-table.js
bootstrap-table.min.css
bootstrap-table.min.js
bootstrap.datepicker.js	Updated more fa icons	2021-09-26 01:11:08 -07:00
dashboard.js
dashboard2.js
demo.js	Updated more fa icons	2021-09-26 01:11:08 -07:00
ekko-lightbox.js
ekko-lightbox.min.js
FileSaver.min.js
html5.js
html5shiv.js
jquery.dragtable.js
jquery.fileupload.js
jquery.iframe-transport.js
jquery.js
jquery.typeahead.min.js
jquery.ui.widget.js
jspdf.min.js
jspdf.plugin.autotable.js
metisMenu.js
metisMenu.min.js
pGenerator.jquery.js
respond.js
select2.min.js
signature_pad.js
signature_pad.min.js
snipeit.js	Updated snipeit.js with "restore" modal code	2021-11-09 22:39:33 -08:00
vendor.js
vue.js
xlsx.core.min.js