mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-12-28 21:15:41 +00:00
Julien Fastré
43d6a86627
# Conflicts: # .gitlab-ci.yml # composer.json # config/services.yaml # phpunit.xml.dist # src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php # src/Bundle/ChillCalendarBundle/Entity/CancelReason.php # src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php # src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php # src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php # src/Bundle/ChillJobBundle/src/Entity/Immersion.php # src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php # src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php # src/Bundle/ChillMainBundle/Entity/Location.php # src/Bundle/ChillMainBundle/Routing/MenuComposer.php # src/Bundle/ChillMainBundle/Routing/MenuTwig.php # src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php # src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php # src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php # src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php # src/Bundle/ChillPersonBundle/Controller/PersonController.php # src/Bundle/ChillPersonBundle/Entity/Person.php # src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php # src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php # src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php # src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php # src/Bundle/ChillTaskBundle/Form/SingleTaskType.php