# Conflicts: # .gitmodules
camptocamp-cloud-platform
base_attachment_object_storage
mass_mailing_partner