Merge branch 'develop'

* develop: OS-106 - non-ascii chars search
OS2Forms · Sep 5, 2024 · bb7c942 · bb7c942
2 parents 7cf7f0a + 10115d7
commit bb7c942
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -212,7 +212,8 @@
                 "3290637 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-05-12/webform_node_element_d10-3290637-11.patch"
             },
             "drupal/webform": {
-                "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"
+                "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",
+                "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"
             }
         },
         "drupal-lenient": {