Merge conflicts resolved

This commit is contained in:
2022-01-27 11:34:57 +01:00
23 changed files with 249 additions and 180 deletions

View File

@@ -530,3 +530,6 @@ household_composition:
Currently no composition: Aucune composition famiale renseignée.
Add a composition: Ajouter une composition familiale
Update composition: Modifier la composition familiale
# docgen
Linked evaluations: Évaluations associées