Merge branch 'prod' into stage

2025-04-08 16:35:22 +02:00
parent 9f6a9a9c5e 8d7ef376ee
commit 6119477d19
9 changed files with 219 additions and 9 deletions
--- a/web/themes/custom/quartiers_de_demain/templates/page--ressources.html.twig
+++ b/web/themes/custom/quartiers_de_demain/templates/page--ressources.html.twig
@@ -39,7 +39,11 @@
 * @see html.html.twig
 */
 #}
+<<<<<<< HEAD
 <div class="layout-container " id="ressources">
+=======
+<div class="layout-container" id="ressources">
+>>>>>>> prod

  <header role="banner">
    {{ page.header_left }}