Merge branch 'develop' into trunk

This commit is contained in:
Vincent BRIDIER 2021-09-21 16:30:35 +02:00
commit 5a6b3b45ea
2 changed files with 827 additions and 409 deletions

View file

@ -15,7 +15,7 @@
"laravel/tinker": "^2.0",
"laravel/ui": "^3.0",
"laravelcollective/html": "6.*",
"ldc/ldccrmv2client": "2.0.14",
"ldc/ldccrmv2client": "2.1.8",
"picqer/php-barcode-generator": "^0.3.0",
"szymach/c-pchart": "^3.0",
"uxweb/sweet-alert": "^2.0"

1234
composer.lock generated

File diff suppressed because it is too large Load diff