|
|
d16de04d27
|
Merge branch 'master' into ticket-app-master
# Conflicts:
# docs/source/development/create-a-new-bundle.md
# src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
# src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
# src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
# src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
# src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
# src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
# src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
# src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
# src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
# src/Bundle/ChillMainBundle/translations/messages.fr.yml
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
|
2025-12-05 17:04:49 +01:00 |
|