Skip to content

Commit

Permalink
Merge pull request #1235 from code-corps/greenkeeper/ember-cli-moment…
Browse files Browse the repository at this point in the history
…-shim-3.1.0

chore(package): update ember-cli-moment-shim to version 3.1.0
  • Loading branch information
begedin committed Apr 10, 2017
2 parents 4a24263 + c434a1f commit 01273d1
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"ember-cli-jwt-decode": "0.0.3",
"ember-cli-meta-tags": "3.0.4",
"ember-cli-mirage": "^0.3.1",
"ember-cli-moment-shim": "3.0.1",
"ember-cli-moment-shim": "3.1.0",
"ember-cli-neat": "0.0.5",
"ember-cli-page-object": "1.8.0",
"ember-cli-password-strength": "1.0.2",
Expand Down
42 changes: 21 additions & 21 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ broccoli-merge-trees@^0.2.3:
debug "^2.2.0"
symlink-or-copy "^1.0.0"

broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3, broccoli-merge-trees@^1.1.4, broccoli-merge-trees@^1.1.5, broccoli-merge-trees@^1.2.1:
broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3, broccoli-merge-trees@^1.1.4, broccoli-merge-trees@^1.2.1:
version "1.2.4"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
dependencies:
Expand Down Expand Up @@ -1518,7 +1518,7 @@ broccoli-sri-hash@^2.1.0:
sri-toolbox "^0.2.0"
symlink-or-copy "^1.0.1"

broccoli-stew@^1.0.0, broccoli-stew@^1.0.4, broccoli-stew@^1.2.0, broccoli-stew@^1.3.3:
broccoli-stew@^1.0.4, broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.4.0.tgz#1bdb0a1804d62a419d190abc26acb3c91878154d"
dependencies:
Expand Down Expand Up @@ -2651,19 +2651,19 @@ ember-cli-mirage@^0.3.1:
pretender "^1.4.2"
route-recognizer "^0.2.3"

ember-cli-moment-shim@3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-3.0.1.tgz#c67c39f71c1c5a38bcc93bfa65b14e25f069895f"
ember-cli-moment-shim@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-3.1.0.tgz#ec6a39a0dcb4badeaf6dcb74a6c05b0bc576f721"
dependencies:
broccoli-funnel "^1.0.0"
broccoli-merge-trees "^1.1.5"
broccoli-stew "^1.0.0"
chalk "^1.1.1"
ember-cli-babel "^5.0.0"
exists-sync "0.0.4"
lodash.defaults "^4.1.0"
moment "^2.13.0"
moment-timezone "^0.5.0"
broccoli-funnel "^1.1.0"
broccoli-merge-trees "^2.0.0"
broccoli-stew "^1.4.0"
chalk "^1.1.3"
ember-cli-babel "^5.1.7"
exists-sync "^0.0.4"
lodash.defaults "^4.2.0"
moment "^2.18.1"
moment-timezone "~0.5.11"

ember-cli-neat@0.0.5:
version "0.0.5"
Expand Down Expand Up @@ -3695,7 +3695,7 @@ exists-sync@0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.3.tgz#b910000bedbb113b378b82f5f5a7638107622dcf"

exists-sync@0.0.4:
exists-sync@0.0.4, exists-sync@^0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879"

Expand Down Expand Up @@ -5031,7 +5031,7 @@ lodash.debounce@^3.1.1:
dependencies:
lodash._getnative "^3.0.0"

lodash.defaults@^4.1.0:
lodash.defaults@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"

Expand Down Expand Up @@ -5406,13 +5406,13 @@ moment-timezone@^0.3.0:
dependencies:
moment ">= 2.6.0"

moment-timezone@^0.5.0:
version "0.5.11"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.11.tgz#9b76c03d8ef514c7e4249a7bbce649eed39ef29f"
moment-timezone@~0.5.11:
version "0.5.13"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.13.tgz#99ce5c7d827262eb0f1f702044177f60745d7b90"
dependencies:
moment ">= 2.6.0"
moment ">= 2.9.0"

"moment@>= 2.6.0", moment@^2.13.0, moment@^2.17.1, moment@^2.18.0:
"moment@>= 2.6.0", "moment@>= 2.9.0", moment@^2.17.1, moment@^2.18.0, moment@^2.18.1:
version "2.18.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"

Expand Down

0 comments on commit 01273d1

Please sign in to comment.