Skip to content

Commit

Permalink
Merge branch 'release/1.x' of https://github.com/massiveart/MassiveSe…
Browse files Browse the repository at this point in the history
…archBundle into release/2.0
  • Loading branch information
alexander-schranz committed Jan 30, 2020
2 parents 5031851 + 18e3ac2 commit 1d7f4aa
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@
},
"extra": {
"branch-alias": {
"dev-release/1.0": "1.0-dev",
"dev-release/1.1": "1.1-dev",
"dev-release/2.0": "2.0-dev",
"dev-master": "2.1-dev"
"dev-release/1.x": "1.0-dev",
"dev-release/2.x": "2.1-dev",
"dev-master": "2.2-dev"
}
}
}

0 comments on commit 1d7f4aa

Please sign in to comment.