Skip to content

Commit

Permalink
Merge branch 'develop' into Haroenv-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
bobylito committed Oct 20, 2017
2 parents e85d515 + 28fc3ce commit cfa6cbd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"semver": "5.4.1",
"shelljs": "0.7.8",
"sinon": "4.0.1",
"style-loader": "0.18.2",
"style-loader": "0.19.0",
"unminified-webpack-plugin": "1.4.1",
"watch": "1.0.2",
"wdio-dot-reporter": "0.0.9",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8950,9 +8950,9 @@ structured-source@^3.0.2:
dependencies:
boundary "^1.0.1"

style-loader@0.18.2:
version "0.18.2"
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.2.tgz#cc31459afbcd6d80b7220ee54b291a9fd66ff5eb"
style-loader@0.19.0:
version "0.19.0"
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.0.tgz#7258e788f0fee6a42d710eaf7d6c2412a4c50759"
dependencies:
loader-utils "^1.0.2"
schema-utils "^0.3.0"
Expand Down

0 comments on commit cfa6cbd

Please sign in to comment.