Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0

marellocommerce · Jul 8, 2020 · d0e8d50 · d0e8d50
2 parents 7d06b51 + c55bef7
commit d0e8d50
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/dev.json b/dev.json
@@ -42,7 +42,8 @@
         "oro/calendar-bundle": "4.1.*",
         "oro/health-check-bundle": "4.1.*",
         "marellocommerce/marello": "self.version",
-        "marellocommerce/marello-enterprise": "self.version"
+        "marellocommerce/marello-enterprise": "self.version",
+        "marellocommerce/marello-magento2-bundle":"self.version"
     },
     "require-dev": {
         "behat/behat": "3.4.*",

diff --git a/dev.lock b/dev.lock
@@ -5099,6 +5099,42 @@
                 "relative": true
             }
         },
+        {
+            "name": "marellocommerce/marello-magento2-bundle",
+            "version": "dev-3.0-test",
+            "dist": {
+                "type": "path",
+                "url": "../../package/marello-magento2-bundle",
+                "reference": "b6644f13bcbe08050b523c6eed03d82ca4d25f6b"
+            },
+            "require": {
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "": "src/"
+                }
+            },
+            "license": [
+                "Commercial"
+            ],
+            "authors": [
+                {
+                    "name": "Marello B.V.",
+                    "homepage": "https://www.marello.com"
+                }
+            ],
+            "description": "Marello Unified Commerce Management Enterprise edition",
+            "homepage": "https://github.com/marellocommerce/marello-magento2-bundle.git",
+            "transport-options": {
+                "relative": true
+            }
+        },
         {
             "name": "michelf/php-markdown",
             "version": "1.9.0",