Merge branch 'release/2.10.1' into develop

zendframework · Dec 31, 2019 · eb1ef5e · eb1ef5e
2 parents 3ab1462 + 6b3a99e
commit eb1ef5e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.10.1 - TBD
+## 2.10.1 - 2019-12-31
 
 - Nothing.
 

diff --git a/composer.json b/composer.json
@@ -50,8 +50,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.9-dev",
-            "dev-develop": "2.10-dev"
+            "dev-master": "2.10.x-dev",
+            "dev-develop": "2.11.x-dev"
         },
         "zf": {
             "component": "Zend\\Db",

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