Merge branch 'hotfix/component-composer-branch-alias' of git://github…

….com/weierophinney/zf2 into weierophinney-hotfix/component-composer-branch-alias
zendframework · Feb 15, 2013 · 8839d0e · 8839d0e
2 parents 07564e2 + a460424
commit 8839d0e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -21,8 +21,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": {