Merge remote-tracking branch 'upstream/master'

zendframework · May 9, 2013 · 17494e9 · 17494e9
commit 17494e9
Show file tree

Hide file tree

Showing 58 changed files with 3,430 additions and 775 deletions.
diff --git a/composer.json b/composer.json
@@ -37,8 +37,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.2-dev",
+            "dev-develop": "2.3-dev"
         }
     },
     "autoload-dev": {