snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Transformers/AssetsTransformer.php # app/Importer/ConsumableImporter.php # app/Models/Consumable.php # config/version.php # package-lock.json # package.json # 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/views/custom_fields/fieldsets/view.blade.php # resources/views/layouts/default.blade.php # routes/web.php # routes/web/fields.php		2021-11-15 19:24:38 -08:00
..
css	Updated snipeit.js with "restore" modal code	2021-11-09 22:39:33 -08:00
img	Added userpics from thispersondoesnotexist.com	2021-09-23 22:05:42 -07:00
js	Merge remote-tracking branch 'origin/master' into develop	2021-11-15 19:24:38 -08:00
uploads	Fixed logo uploads	2020-04-27 23:22:52 -07:00
vendor/livewire	Most of the basics are working, but not done and lots of debug messages are about	2021-10-04 22:06:48 -07:00
.htaccess	Exclude web.config from Apache	2021-10-11 14:14:00 +02:00
favicon.ico	Default favicon	2020-02-11 20:19:24 -08:00
index.php	Misc fixes for shift	2021-06-11 14:07:50 -07:00
mix-manifest.json	Updated snipeit.js with "restore" modal code	2021-11-09 22:39:33 -08:00
mix.js.map	Added resources	2020-04-22 07:15:24 -07:00
robots.txt	Disallow / in robots	2017-09-28 17:47:48 -07:00
web.config	Fix for IIS+ Chrome not showing webfonts	2017-11-06 16:51:46 -08:00