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

..

css

Merge master into develop

2022-01-12 20:51:33 -08:00

img

Added userpics from thispersondoesnotexist.com

2021-09-23 22:05:42 -07:00

js

Merge master into develop

2022-01-12 20:51:33 -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

Merge master down into develop

2021-12-16 14:26:24 -08: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

Regenerated assets to pikc up #10089 changes

2022-01-11 14:38:17 -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