Skip to content

Commit 9699e02

Browse files
committed
Merge branch 'develop'
* develop: Adding doctrine/annotations Adding doctrine/annotations Updating drupal/webform OS-272 updating drupal core 10.6.7
2 parents b2c3665 + 93ea3ae commit 9699e02

2 files changed

Lines changed: 291 additions & 289 deletions

File tree

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,13 @@
6868
"php": ">=7.1",
6969
"composer/installers": "^1.9",
7070
"cweagans/composer-patches": "^1.7",
71+
"doctrine/annotations": "^2.0",
7172
"drupal/bootstrap": "^3.32",
7273
"drupal/ckeditor": "^1.0",
7374
"drupal/color": "^1.0",
74-
"drupal/core-composer-scaffold": "10.5.8",
75-
"drupal/core-project-message": "10.5.8",
76-
"drupal/core-recommended": "10.5.8",
75+
"drupal/core-composer-scaffold": "10.6.7",
76+
"drupal/core-project-message": "10.6.7",
77+
"drupal/core-recommended": "10.6.7",
7778
"drupal/core-vendor-hardening": "^9.4",
7879
"drupal/email_tfa": "^2.0",
7980
"drupal/entity_export_csv": "^2.0@beta",
@@ -191,8 +192,7 @@
191192
"3290637 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-05-12/webform_node_element_d10-3290637-11.patch"
192193
},
193194
"drupal/webform": {
194-
"3458611 Removing the polyfill-fastly.io library of webform.libraries.yml": "https://www.drupal.org/files/issues/2024-07-02/3458611-removing-the-polyfill-io.patch",
195-
"3415445 - Search Chinese in /admin/structure/webform cause error: Illegal mix of collations": "https://www.drupal.org/files/issues/2024-02-26/3415445-cant-load-non-english_0.patch"
195+
"3458611 Removing the polyfill-fastly.io library of webform.libraries.yml": "https://www.drupal.org/files/issues/2024-07-02/3458611-removing-the-polyfill-io.patch"
196196
},
197197
"drupal/user_default_page": {
198198
"3351887 - Deprecated function: strpos(): Passing null to parameter #1 ($haystack) of type string is deprecated in user_default_page_user_login()": "https://www.drupal.org/files/issues/2023-04-19/added_condition_to_check_null-3351887-1.patch"

0 commit comments

Comments
 (0)