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

….com/weierophinney/zf2 into weierophinney-hotfix/component-composer-branch-alias
zendframework · Feb 15, 2013 · 6efac6a · 6efac6a
commit 6efac6a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -17,6 +17,12 @@
     "suggest": {
         "zendframework/zend-di": "Zend\\Di component"
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
+        }
+    },
     "homepage": "https://github.com/zendframework/zend-service-manager",
     "autoload-dev": {
         "psr-4": {