Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
rgrebenchuk committed Feb 24, 2014
1 parent eca2562 commit f83070f
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
}
],
"minimum-stability": "dev",
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
Expand Down

0 comments on commit f83070f

Please sign in to comment.