]> _ Git - bastide-resah.git/commit
Merge remote-tracking branch 'origin/master'
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 6 May 2024 16:00:08 +0000 (18:00 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 6 May 2024 16:00:08 +0000 (18:00 +0200)
commit183904dd07cf82298c5a09f560ac1f3ef774ba4a
tree8897a5ef41e65c2732d7d216f802d9a0e787c68e
parentb8a026966c257db708951ed4c6f5d4b45a45e86d
parent0fd4d679d10d0e2ae57c7d614f23b153c1b59a35
Merge remote-tracking branch 'origin/master'

# Conflicts:
# resources/webflow/charte-de-protection-des-donnees-personnelles.html
# resources/webflow/js/custom.js
# resources/webflow/mentions-legales.html
resources/webflow/charte-de-protection-des-donnees-personnelles.html
resources/webflow/index.html
resources/webflow/mentions-legales.html