Merge branch 'release/2.3.0'

zfcampus · Jan 24, 2019 · 65e80f0 · 65e80f0
2 parents 2571a93 + de96d63
commit 65e80f0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.3.0 - TBD
+## 2.3.0 - 2019-01-24
 
 ### Added
 
@@ -27,28 +27,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.2.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.2.1 - 2018-12-03
 
 ### Added

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2016, Zend Technologies USA, Inc.
+Copyright (c) 2016-2019, Zend Technologies USA, Inc.
 
 All rights reserved.
 

diff --git a/composer.json b/composer.json
@@ -22,8 +22,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2-dev",
-            "dev-develop": "2.3-dev"
+            "dev-master": "2.3.x-dev",
+            "dev-develop": "2.4.x-dev"
         },
         "zf": {
             "module": [

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