Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ikakarov committed Nov 30, 2020
2 parents 56179df + 7beda9d commit 758b06e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"require": {
"php": "^7.2",
"nesbot/carbon": "^2.16",
"sylius/sylius": "1.6.*",
"sylius/sylius": ">=1.6",
"ext-openssl": "*"
},
"require-dev": {
Expand Down Expand Up @@ -47,7 +47,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.6-dev"
"dev-master": "1.7"
}
}
}

0 comments on commit 758b06e

Please sign in to comment.