Merge pull request #92 from stefanpenner/shim-upgrade

bumping ember-cli-moment-shim to warn on mismatch locales
adopted-ember-addons · Aug 23, 2015 · 1ca83a3 · 1ca83a3
2 parents ed30ccb + e58fe1a
commit 1ca83a3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 3.6.2
+
+* Warn on locale mismatch, silently ignore `en` locale since included by default in moment
+
 ### 3.6.1
 
 * Bugfix global output format

diff --git a/blueprints/ember-moment/index.js b/blueprints/ember-moment/index.js
@@ -8,6 +8,6 @@ module.exports = {
   },
 
   afterInstall: function() {
-    return this.addAddonToProject('ember-cli-moment-shim', '0.6.1');
+    return this.addAddonToProject('ember-cli-moment-shim', '0.6.2');
   }
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-moment",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "Moment.js template helpers and computed property macros for Ember",
   "directories": {
     "doc": "doc",
@@ -26,7 +26,7 @@
     "ember-cli-htmlbars": "0.7.9",
     "ember-cli-htmlbars-inline-precompile": "^0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-moment-shim": "0.6.1",
+    "ember-cli-moment-shim": "0.6.2",
     "ember-cli-qunit": "0.3.20",
     "ember-cli-release": "0.2.3",
     "ember-cli-uglify": "^1.0.1",