Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper-eslint-2.12.0
Browse files Browse the repository at this point in the history
* master:
  TASK: Fix a stylelint deprecation warning
  chore(package): update redux-actions to version 0.10.0
  chore(package): update eslint to version 2.11.1
  • Loading branch information
Inkdpixels committed Jun 11, 2016
2 parents 5757133 + 1074dac commit f755cbc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"declaration-colon-space-after": "always",
"declaration-colon-space-before": "never",
"function-comma-space-after": "always",
"function-url-quotes": "single",
"function-url-quotes": "always",
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-name-no-vendor-prefix": true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"react-motion": "^0.4.2",
"react-redux": "^4.4.5",
"redux": "^3.4.0",
"redux-actions": "^0.9.1",
"redux-actions": "^0.10.0",
"redux-saga": "^0.10.2",
"reselect": "^2.4.0",
"uuid": "^2.0.2",
Expand Down

0 comments on commit f755cbc

Please sign in to comment.