Merge branch 'trunk'

This commit is contained in:
Jérémy Munsch 2021-11-15 14:32:09 +01:00
commit b251605fa3
No known key found for this signature in database
GPG key ID: 55196BEE445F6049
3 changed files with 345 additions and 262 deletions

View file

@ -1,4 +1,4 @@
### 25.10 -> 1.0.4
### 25.10 -> 1.0.5
- Ajout d'un nouveau type de Ticket : Demande relative aux BR, ceci afin de faire une demande
qui concernerait les bons de réduction
- Correction Plannings

View file

@ -15,9 +15,9 @@
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"kwaadpepper/crud-policies": "^0.1.22",
"kwaadpepper/crud-policies": "^0.2.0",
"kwaadpepper/enum": "^2.1",
"kwaadpepper/exception-handler": "^0.0.3",
"kwaadpepper/exception-handler": "^0.0.5",
"laravel-lang/lang": "~8.0",
"laravel/framework": "^8.12",
"laravel/tinker": "^2.5",

601
composer.lock generated

File diff suppressed because it is too large Load diff