Merged Source/Master

zendframework · Mar 13, 2013 · 73dcc77 · 73dcc77
commit 73dcc77
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -18,6 +18,12 @@
         "zendframework/zend-server": "self.version",
         "zendframework/zend-stdlib": "self.version"
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
+        }
+    },
     "homepage": "https://github.com/zendframework/zend-xml-rpc",
     "autoload-dev": {
         "psr-4": {