Skip to content

Commit abb34d5

Browse files
author
CI bot
committed
Merge remote-tracking branch 'remotes/dev/5.0' into 5.0
2 parents af503d9 + d9ddd9e commit abb34d5

File tree

4 files changed

+1238
-1279
lines changed

4 files changed

+1238
-1279
lines changed

.browserslistrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ last 1 firefox version
22
last 1 chrome version
33
last 1 edge version
44
last 1 safari version
5+
last 1 iOS version

dev.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
"symfony/web-profiler-bundle": "~5.4.0",
6262
"friendsofphp/php-cs-fixer": "~3.4.0",
6363
"oro/twig-inspector": "1.0.*",
64-
"oro/platform-documentation-examples": "5.0.x-dev"
64+
"oro/platform-documentation-examples": "5.0.x-dev",
65+
"oro/maker": "5.0.x-dev"
6566
},
6667
"config": {
6768
"bin-dir": "bin",

0 commit comments

Comments
 (0)