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

oroinc · Jun 25, 2019 · 6cce6f2 · 6cce6f2
2 parents 986c828 + f6b771f
commit 6cce6f2
Show file tree

Hide file tree

Showing 2 changed files with 191 additions and 152 deletions.
diff --git a/dev.json b/dev.json
@@ -58,7 +58,10 @@
     "phpunit/phpcov": "4.0.*",
     "symfony/phpunit-bridge": "3.4.*",
     "friendsofphp/php-cs-fixer": "2.12.6",
-    "oro/twig-inspector": "1.0.*"
+    "oro/twig-inspector": "1.0.*",
+    "oro/commerce-documentation-examples": "~3.1.1",
+    "oro/crm-documentation-examples": "~3.1.1",
+    "oro/platform-documentation-examples": "~3.1.1"
   },
   "config": {
     "component-dir": "public/bundles/components",
@@ -147,6 +150,18 @@
       "type": "path",
       "url": "../../package/*"
     },
+    {
+      "type": "path",
+      "url": "../../documentation/commerce/code_examples"
+    },
+    {
+      "type": "path",
+      "url": "../../documentation/crm/code_examples"
+    },
+    {
+      "type": "path",
+      "url": "../../documentation/platform/code_examples"
+    },
     {
       "type": "composer",
       "url": "https://packagist.orocrm.com"