Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-10-08 06:19:42 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into ticket-app-master

Browse Source 
# Conflicts:
#	.eslint-baseline.json
#	src/Bundle/ChillMainBundle/Entity/User.php
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
#	src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
This commit is contained in:
Julien Fastré
2025-09-05 18:32:01 +02:00
parent 25561cdf63 af13bf9088
commit 2665e43a61
192 changed files with 6915 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
View File

@@ -21,6 +21,9 @@ accompanying_period:
other {Participants}
}
number: >-
n° {id}
person:
from_the: depuis le
And himself: >-