2.2.0 readiness

Conflicts: composer.json composer.lock
zendframework · Mar 8, 2018 · 049e20e · 049e20e
2 parents 2324b56 + de653e3
commit 049e20e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -49,9 +49,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev",
-            "dev-develop": "2.2.x-dev",
-            "dev-release-3.0.0": "3.0.x-dev"
+            "dev-master": "2.2.x-dev",
+            "dev-develop": "3.0.x-dev"
         },
         "zf": {
             "config-provider": "Zend\\Expressive\\Router\\AuraRouter\\ConfigProvider"

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