Skip to content
Permalink
Browse files

Merge 950a100 into ca3b321

  • Loading branch information
greenkeeper committed Jul 7, 2018
2 parents ca3b321 + 950a100 commit d6b405b897c8bab6ec865e8f461af6384c4e3918
Showing with 4 additions and 4 deletions.
  1. +1 −1 package.json
  2. +3 −3 yarn.lock
@@ -40,7 +40,7 @@
"babel-plugin-transform-es2015-modules-amd": "^6.24.0",
"bower-config": "^1.3.0",
"bower-endpoint-parser": "0.2.2",
"broccoli-amd-funnel": "^1.3.0",
"broccoli-amd-funnel": "^2.0.0",
"broccoli-babel-transpiler": "^6.0.0",
"broccoli-builder": "^0.18.8",
"broccoli-concat": "^3.2.2",
@@ -612,9 +612,9 @@ braces@^2.3.1:
split-string "^3.0.2"
to-regex "^3.0.1"

broccoli-amd-funnel@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/broccoli-amd-funnel/-/broccoli-amd-funnel-1.3.0.tgz#c4426b4fce976e44295bd74f34725f53bdeb08e3"
broccoli-amd-funnel@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.0.tgz#00627161bab7f22b420ea85c81f48001f11843e8"
dependencies:
broccoli-plugin "^1.3.0"
symlink-or-copy "^1.2.0"

0 comments on commit d6b405b

Please sign in to comment.
You can’t perform that action at this time.