Merge branch 'release' into beta

ember-cli · Mar 1, 2022 · 94f63ac · 94f63ac
2 parents 1d7a258 + f3395fd
commit 94f63ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,11 @@
 # ember-cli Changelog
 
-## v4.2.0-beta.1
+## v4.2.0
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.1.0...v4.2.0-beta.1)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.1.0...v4.2.0-beta.1)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.1.1...v4.2.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.1.1...v4.2.0)
 
 #### Changelog
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.2.0-beta.1",
+  "version": "4.2.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",