Merge branch 'branch-aliases' into develop

zendframework · Apr 25, 2017 · 960fc8a · 960fc8a
2 parents d73fbec + 94ba1ca
commit 960fc8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,8 @@
     "license": "BSD-3-Clause",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.0-dev",
+            "dev-develop": "1.1-dev"
         },
         "class": "Zend\\ComponentInstaller\\ComponentInstaller"
     },

diff --git a/composer.lock b/composer.lock