Skip to content

Commit

Permalink
Merge branch 'master' into migrate-cardstack
Browse files Browse the repository at this point in the history
  • Loading branch information
jmurzy authored Jun 21, 2016
2 parents 4c8e8cc + 2c57f6e commit 998d153
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
"devDependencies": {
"babel-eslint": "^6.0.0",
"eslint": "^2.5.3",
"eslint-plugin-babel": "^3.2.0",
"eslint-plugin-flow-vars": "^0.2.1",
"eslint-plugin-react": "^4.2.1",
"flow-bin": "^0.27.0",
Expand Down

0 comments on commit 998d153

Please sign in to comment.