[17] Merge api-proto with develop #71

magento · Jun 16, 2020 · a5673b4 · a5673b4
1 parent f59b398
commit a5673b4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -319,7 +319,8 @@
  "magento/module-storefront-graph-ql": "*",
  "magento/module-catalog-export" : "*",
  "magento/module-catalog-export-api" : "*",
- "magento/module-catalog-message-broker": "*"
+ "magento/module-catalog-message-broker": "*",
+ "magento/module-catalog-data-exporter": "*"
  },
  "conflict": {
  "gene/bluefoot": "*"

diff --git a/composer.lock b/composer.lock