Merge branch 'release/2.0.0'

webimpress · Nov 27, 2019 · d03bea3 · d03bea3
2 parents a98c448 + fc4682e
commit d03bea3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 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.0.0 - TBD
+## 2.0.0 - 2019-11-27
 
 ### Added
 
@@ -27,28 +27,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 1.0.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 1.0.1 - 2019-11-16
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -31,8 +31,9 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev",
-            "dev-develop": "1.1.x-dev"
+            "dev-master": "2.0.x-dev",
+            "dev-develop": "2.1.x-dev",
+            "dev-release-1.0": "1.0.x-dev"
         }
     },
     "scripts": {