v4.2.1

jamesarosen · Apr 29, 2016 · 055e83a · 055e83a
1 parent e0ee8e8
commit 055e83a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,8 @@
+## 4.2.1
+
+ * use `Ember.assign` instead of `Ember.merge` if available
+ * add `no` locale support
+
 ## 4.2.0
 
  * remove `Stream` awareness from `service:i18n` to ensure streamless

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-i18n",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Internationalization for Ember",
   "directories": {
     "doc": "doc",