Merge pull request #3566 from CityOfBoston/master

(production) Drupal Maintenance, Translation fix
CityOfBoston · Aug 9, 2024 · 516f838 · 516f838
2 parents 284ba8e + 8088b1e
commit 516f838
Show file tree

Hide file tree

Showing 168 changed files with 504 additions and 280 deletions.
diff --git a/composer.json b/composer.json
@@ -226,7 +226,8 @@
         "squizlabs/php_codesniffer": "^3.5"
     },
     "conflict": {
-        "drupal/core": "7.*"
+        "drupal/core": "7.*",
+        "drupal/embed": "1.8.0"
     },
     "config": {
         "sort-packages": true,