Merge branch 'versions/2.1.0'

2.1.0 readiness
zendframework · Feb 18, 2016 · 2c8a6ec · 2c8a6ec
2 parents 3f9a02b + 9e0954f
commit 2c8a6ec
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -36,8 +36,9 @@
     "extra": {
         "branch-alias": {
             "dev-release-1.0": "1.0-dev",
-            "dev-master": "2.0-dev",
-            "dev-develop": "2.1-dev"
+            "dev-release-1.1": "1.1-dev",
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {