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

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