Merge branch 'master' into 102_activites_annexes

This commit is contained in:
2021-08-17 12:59:26 +02:00
143 changed files with 7439 additions and 2533 deletions

View File

@@ -20,7 +20,8 @@
"Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
"Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
"Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
"Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src"
"Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
"Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle"
}
},
"autoload-dev": {
@@ -90,4 +91,4 @@
"config": {
"bin-dir": "bin"
}
}
}