Skip to content
Snippets Groups Projects
Commit 52e9a7fb authored by GitLab CI's avatar GitLab CI
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !9
parents 093c3299 1a457c6c
No related branches found
No related tags found
1 merge request!9Merging develop into main
Pipeline #1389918 passed
......@@ -46,8 +46,7 @@
"lakedrops/d10-project-scaffold": "^1.0||dev-develop"
},
"require-dev": {
"lakedrops/drupal-development-environment": "^3.2||dev-develop",
"roave/security-advisories": "dev-latest"
"lakedrops/drupal-development-environment": "^3.2||dev-develop"
},
"conflict": {
"drupal/drupal": "*"
......@@ -60,6 +59,7 @@
"cweagans/composer-patches": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"drupal/core-composer-scaffold": true,
"drupal/core-project-message": true,
"drupal/core-vendor-hardening": true,
"endroid/installer": true,
"lakedrops/*": true,
......@@ -72,7 +72,7 @@
},
"extra": {
"lakedrops-default": true,
"patches-file": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10-3.json",
"patches-file": "https://gitlab.lakedrops.com/composer/drupal-default-config/-/raw/main/d10-4.json",
"enable-patching": true
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment