Mathieu Jaumotte 503293a359 Merge branch 'master' into '37_modal_add-persons' ...

# Conflicts:
#   src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
#   src/Bundle/ChillPersonBundle/chill.webpack.config.js

2021-05-07 13:35:48 +00:00

..

doc

fix folder name

2021-03-18 13:37:13 +01:00

fixtures

fix folder name

2021-03-18 13:37:13 +01:00

public

move Modal component in ChillMainAssets

2021-05-07 15:28:50 +02:00

test

fix tests for chill main

2021-04-27 16:33:44 +02:00

views

update twig template and AddressType following the changes in Address entity

2021-05-03 09:28:05 +02:00