Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to main #25

Merged
merged 12 commits into from
Dec 14, 2023
Merged
2 changes: 1 addition & 1 deletion .platform/schema
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3
4
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ This is the repository for the new drupal emergency website.

## Includes

- Drupal 9.x
- Drush 11.x
- Drupal 10.x
- Drush 12.x
- Docker setup for development using [Stonehenge](https://github.com/druidfi/stonehenge)
- [druidfi/tools](https://github.com/druidfi/tools)
- Web root is `/public`
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
"require": {
"composer/installers": "^2.0",
"cweagans/composer-patches": "^1.6.7",
"drupal/core-composer-scaffold": "^9.5",
"drupal/hdbt": "^5.0",
"drupal/hdbt_admin": "^2.0",
"drupal/helfi_azure_fs": "^1.0",
"drupal/core-composer-scaffold": "^10.1",
"drupal/hdbt": "^6.0",
"drupal/hdbt_admin": "^3.0",
"drupal/helfi_azure_fs": "^2.0",
"drupal/helfi_drupal_tools": "dev-main",
"drupal/helfi_platform_config": "^3.0.32",
"drupal/helfi_platform_config": "^4.0.0",
"drupal/real_aes": "^2.5",
"drupal/smtp": "^1.2",
"drupal/tfa": "^1.3",
"drush/drush": "^10.4 || ^11"
"drush/drush": "^11 || ^12"
},
"require-dev": {
"donatj/mock-webserver": "^2.4",
"drupal/coder": "^8.3",
"drupal/core-dev": "^9.5",
"drupal/core-dev": "^10.1",
"jangregor/phpstan-prophecy": "^1.0",
"mglaman/phpstan-drupal": "^1.2",
"phpspec/prophecy-phpunit": "^2",
Expand Down
Loading
Loading