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

oroinc · Jun 3, 2019 · ade32a3 · ade32a3
2 parents 6540fe8 + bef59e8
commit ade32a3
Show file tree

Hide file tree

Showing 3 changed files with 267 additions and 176 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,8 @@
     "oro/crm-dotmailer": "~3.1.1",
     "oro/crm-zendesk": "~3.1.1",
     "oro/commerce": "~3.1.1",
-    "oro/commerce-crm": "~3.1.1"
+    "oro/commerce-crm": "~3.1.1",
+    "oro/google-tag-manager-bundle": "~3.1.1"
   },
   "require-dev": {
     "sensio/generator-bundle": "3.1.*",

diff --git a/dev.json b/dev.json
@@ -39,7 +39,8 @@
     "oro/crm-dotmailer": "~3.1.1",
     "oro/crm-zendesk": "~3.1.1",
     "oro/commerce-infinitepay": "~3.1.1",
-    "oro/redis-config": "~3.1.1"
+    "oro/redis-config": "~3.1.1",
+    "oro/google-tag-manager-bundle": "~3.1.1"
   },
   "require-dev": {
     "sensio/generator-bundle": "3.1.*",