Merge remote-tracking branch 'remotes/dev/4.1' into 4.1

oroinc · Apr 29, 2020 · e4797fb · e4797fb
2 parents 35b6f8c + 4d98e1e
commit e4797fb
Show file tree

Hide file tree

Showing 5 changed files with 453 additions and 180 deletions.
diff --git a/composer.json b/composer.json
@@ -34,9 +34,9 @@
   "require-dev": {
     "behat/behat": "3.4.*",
     "behat/gherkin": "4.6.0",
-    "behat/mink": "1.7.x-dev#6d637f7",
+    "behat/mink": "dev-master#6d637f7af4816c26ad8a943da2e3f7eef1231bea",
     "behat/mink-extension": "2.3.*",
-    "behat/mink-selenium2-driver": "1.*",
+    "behat/mink-selenium2-driver": "1.3.1",
     "behat/symfony2-extension": "2.1.*",
     "nelmio/alice": "3.5.*",
     "theofidry/alice-data-fixtures": "1.0.*",

diff --git a/dev.json b/dev.json
@@ -39,14 +39,15 @@
     "oro/crm-zendesk": "4.1.x-dev",
     "oro/commerce-infinitepay": "4.1.x-dev",
     "oro/redis-config": "4.1.x-dev",
-    "oro/google-tag-manager-bundle": "4.1.x-dev"
+    "oro/google-tag-manager-bundle": "4.1.x-dev",
+    "oro/mailchimp": "4.1.x-dev"
   },
   "require-dev": {
     "behat/behat": "3.4.*",
     "behat/gherkin": "4.6.0",
-    "behat/mink": "1.7.x-dev#6d637f7",
+    "behat/mink": "dev-master#6d637f7af4816c26ad8a943da2e3f7eef1231bea",
     "behat/mink-extension": "2.3.*",
-    "behat/mink-selenium2-driver": "1.*",
+    "behat/mink-selenium2-driver": "1.3.1",
     "behat/symfony2-extension": "2.1.*",
     "nelmio/alice": "3.5.*",
     "theofidry/alice-data-fixtures": "1.0.*",