Skip to content

Commit

Permalink
Merge pull request #618 from dhensby/pulls/master-alias
Browse files Browse the repository at this point in the history
Merged #618
  • Loading branch information
bummzack authored Oct 24, 2017
2 parents fae1bd5 + 3d28221 commit 66e40a6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"installer-name": "silvershop",
"snapshot" : "https://raw.github.com/silvershop/silvershop-core/gh-pages/assets/screenshots/shipping%20estimate%20form.png",
"branch-alias": {
"dev-master": "1.2.x-dev"
"dev-master": "2.x-dev"
}
},
"support":{
Expand Down

0 comments on commit 66e40a6

Please sign in to comment.