Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/component-composer-branch-alias' of git://github…
Browse files Browse the repository at this point in the history 
….com/weierophinney/zf2 into weierophinney-hotfix/component-composer-branch-alias
  • Loading branch information
@ralphschindler
ralphschindler committed Feb 15, 2013
42 parents c65c180 + d9cce25 + 9a04dec + c948ef1 + bb8d758 + 681350e + 535bf8a + 6308000 + 43c0375 + b6882cc + 5ab9938 + aee3039 + d0c6f97 + def4669 + 1d9336b + 186c74b + 06a51e4 + 3c55c64 + 8673a50 + c5e096f + 21a2d03 + 63799fd + 457cc49 + 15924e3 + 7f82fa6 + 4b06447 + b2bc2d7 + 581d4ea + 2208cf2 + 782856d + af684a7 + a30a853 + c39d541 + 323eff0 + efa008a + bc6d3ee + b2d0cd0 + f86fbc9 + 92dce0d + 4299d35 + 39ca271 + c4c43d2 commit 3453a81
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.1-dev",
"dev-develop": "2.2-dev"
}
},
"autoload-dev": {
Expand Down

0 comments on commit 3453a81

Please sign in to comment.