Merge branch 'develop' into 'feature/update-chat-version'
# Conflicts: # package.json
Affichage de
- package-lock.json 4 ajouts, 4 suppressionspackage-lock.json
- src/shared/sections/add-task/task-new-edit-form.tsx 1 ajout, 1 suppressionsrc/shared/sections/add-task/task-new-edit-form.tsx
- src/shared/sections/agency/view/agency-list-view.tsx 36 ajouts, 67 suppressionssrc/shared/sections/agency/view/agency-list-view.tsx
- src/shared/sections/all-projetcs/page.tsx 2 ajouts, 12 suppressionssrc/shared/sections/all-projetcs/page.tsx
- src/shared/sections/home/admin-dash.tsx 7 ajouts, 2 suppressionssrc/shared/sections/home/admin-dash.tsx
- src/shared/sections/rewards/statistics/analytic-reward-view.tsx 51 ajouts, 28 suppressions...ared/sections/rewards/statistics/analytic-reward-view.tsx
- version.txt 1 ajout, 1 suppressionversion.txt
- yarn.lock 4 ajouts, 4 suppressionsyarn.lock
Veuillez vous inscrire ou vous se connecter pour commenter