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

oroinc · Nov 30, 2022 · 63b3ec9 · 63b3ec9
2 parents 0261b4a + c39def9
commit 63b3ec9
Show file tree

Hide file tree

Showing 4 changed files with 1,223 additions and 1,220 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -2,3 +2,4 @@ last 1 firefox version
 last 1 chrome version
 last 1 edge version
 last 1 safari version
+last 1 iOS version
diff --git a/dev.json b/dev.json
@@ -70,7 +70,8 @@
     "oro/twig-inspector": "1.0.*",
     "oro/commerce-documentation-examples": "5.0.x-dev",
     "oro/crm-documentation-examples": "5.0.x-dev",
-    "oro/platform-documentation-examples": "5.0.x-dev"
+    "oro/platform-documentation-examples": "5.0.x-dev",
+    "oro/maker": "5.0.x-dev"
   },
   "config": {
     "bin-dir": "bin",