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

Commit

Permalink
Merge pull request zendframework/zendframework#5964 in develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Maks3w committed Mar 13, 2014
148 parents 40c89d1 + fcf4ade + 25a3033 + 178b782 + ded697e + a3c336e + 24906a9 + 6719dba + 622964b + c849349 + 5416b05 + 4e7144b + ad4f87d + 428eb4c + 604814c + fc3d8de + 3a37ce6 + 55daa98 + 4ea5b34 + 92203eb + 757d24d + 02e6999 + edaf480 + 1ede9ce + 8630680 + 37a0c6a + ce1693c + aaa5805 + 7178893 + fc92b9d + d5f6e5e + 4794336 + 1daeb27 + c2a004d + 1b82450 + 3e3dc89 + 861a016 + 86fe89b + af29b04 + b12ad9d + 8eb23ea + 52feefb + 972a9a6 + 212de55 + 2866041 + 7d1f90d + 1f5cb72 + 221c254 + d4f9d25 + 3b0e0d4 + d488887 + 3c450c0 + 964d943 + 679904a + d7eb727 + ea05ef8 + 431fead + fd64604 + 3581ced + c0932a7 + 41e40fd + 3f58aba + e4adfe2 + 5098e2a + 78fb9c8 + 97b778e + e99f479 + b48227e + 935ccef + cb90274 + 58baa5d + e14016b + f4de487 + 4f34d57 + 0dcd117 + 54c204b + 3022d9e + 0227f1f + 56bcb11 + b4afbfa + 736c546 + 6b6568d + 8286d5b + 23843e6 + 8c2b9ff + 506e98d + 4cf9ade + 2876fe6 + 0d2038d + acad728 + 36c4a42 + f137cd9 + 06e2761 + 9f06d58 + d3fd832 + 49269e7 + 06fe394 + 9a0cef5 + fbd3ec7 + 14bf51d + 2030708 + cc70e20 + ab784fe + 5211392 + 7adf0de + cd44572 + d402762 + faf998a + d914ee1 + bbb5f4a + 4f26772 + ba3fdbf + 8b4ce10 + e5c953a + 3e61a9d + 1c6e914 + 73d4c1d + 1d5a36e + cf94d1e + 408aa85 + 46f6392 + 91ae13f + 22f0b85 + 7d7b227 + 2aa3fc8 + f9e7ca2 + 420f236 + 5d0ecc2 + 52c4962 + 83eeef8 + a732f5e + 6d59e2e + 6d333fa + 06ddef2 + 64941d5 + 4ba6c23 + 4fc9baf + 28613cf + 98b3922 + 2fc78f0 + f541107 + 4766daa + 99e1342 + a952daa + 599e687 + dd3e78b + 43e166a + 8868ffc commit c843b73
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 @@ -27,8 +27,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.2-dev",
"dev-develop": "2.3-dev"
"dev-master": "2.3-dev",
"dev-develop": "2.4-dev"
}
},
"autoload-dev": {
Expand Down

0 comments on commit c843b73

Please sign in to comment.