merge

2022-11-25 12:05:17 +01:00
parent 2065a09d30 d96e14918d
commit a3f86e6bc1
12 changed files with 514 additions and 47 deletions
@@ -38,6 +38,7 @@
        "drupal/paragraphs": "1.x-dev@dev",
        "drupal/role_delegation": "^1.1",
        "drupal/structure_sync": "^2.0",
+        "drupal/views_conditional": "^1.5",
        "drupal/webform": "^6.1",
        "geocoder-php/mapquest-provider": "^4.2",
        "wikimedia/composer-merge-plugin": "^2.0"
@@ -54,7 +55,11 @@
            "drupal/console-extend-plugin": true,
            "cweagans/composer-patches": true,
            "drupal/core-composer-scaffold": true,
+<<<<<<< HEAD
            "drupal/core-project-message": false,
+=======
+            "drupal/core-project-message": true,
+>>>>>>> d96e14918d8744277184836ca08599e09512fdba
            "wikimedia/composer-merge-plugin": true
        }
    },