Merge branch 'hotfix/branch-aliases'

Update branch aliases to: - master: 2.5-dev - develop: 2.6-dev
zendframework · Jun 3, 2015 · d2d3db1 · d2d3db1
2 parents 9aad812 + 5fc897f
commit d2d3db1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -70,8 +70,8 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.5-dev",
+            "dev-develop": "2.6-dev"
         }
     }
 }