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

Commit

Permalink
Merge pull request zendframework/zendframework#7391 from samsonasik/h…
Browse files Browse the repository at this point in the history
…otfix/composer-branch-alias

update composer's branch-alias
  • Loading branch information
weierophinney committed May 4, 2015
153 parents be1e921 + 2f70d81 + d570ff1 + 83a8226 + 52a7c3f + a6e83c4 + 1ddadb6 + 2a36660 + b606864 + 41467b4 + b11a11a + de9f81e + 5737317 + c7cdc55 + a50e2ae + 80fc529 + ba58ad8 + a20b034 + f3031d6 + f095b61 + ee7be4f + 5cd5b6f + 560bbb2 + 211c08a + 164a230 + 1fa8900 + 2b3577e + 495bb6c + ab5c324 + 2e456c8 + 63bff97 + f7e139b + 3cb454e + 22f9181 + 93a693f + 2a458de + 1c142d8 + 7f95140 + be3c33f + 7ab0a73 + 8cb2a33 + 56ac953 + 4157e43 + 0ec8c93 + 4bea232 + 26b2403 + 11d87a1 + fb85298 + 6bda27e + b73658e + 1020b71 + 58956c7 + 4de672f + 79fe77b + 7624c04 + cfbc839 + 49e4d7c + ff81391 + 21cca29 + f0671be + 7c4ff71 + 98d530a + 8d88cc5 + 390535a + 00e3a5a + 1debe09 + 90714d6 + b60de46 + 239a3c3 + 623bc45 + caef534 + 2df5656 + 43268cd + a75eec7 + 2567e8f + ea9335d + 464392f + 7fd0ba3 + 1e64d87 + c8ba509 + ca73950 + c8dc1c3 + bb4f382 + c7e8658 + 7182b57 + 7681cd3 + 9e9880e + e68c740 + a5f5145 + e24bcf7 + 0cf2624 + 74f8e99 + 9dc42d7 + 6918467 + 75ec452 + 7032642 + 79c38ce + 995e0a7 + bb2d896 + 1b246ad + b74beb0 + d10206d + 242a79a + 8a250b9 + 537a949 + 9269d97 + 2698f19 + 4cf6c67 + 5866634 + 6ef9027 + af148c0 + e8a3d3b + 769eee2 + db12820 + 0b7828e + 1da1921 + 9643cb4 + c09dfeb + 831c808 + 346e46a + 09df463 + a6b3a5c + 81271a1 + a27453a + 64fe065 + 042e1cd + abd6687 + 0dcab85 + b47ae92 + 630648b + 3a97e95 + 1a3b527 + 53e423c + 854a12d + accad73 + 4a1dcdf + 702a810 + 27b5402 + 2e72915 + b3b3e70 + 2167dc1 + 11755e5 + 9f3168a + 41ccf67 + 3a098d5 + 829f99f + c825927 + 016e78a + 42bff56 + 8843f91 + af6e574 + 4f3c83d + 8d34c85 commit dcf8116
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 @@ -17,8 +17,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.3-dev",
"dev-develop": "2.4-dev"
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
}
},
"autoload-dev": {
Expand Down

0 comments on commit dcf8116

Please sign in to comment.