Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dfee/rbx
Browse files Browse the repository at this point in the history
  • Loading branch information
dfee committed Mar 28, 2019
2 parents c53181c + df61fd6 commit 7e05966
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 76 deletions.
159 changes: 89 additions & 70 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"prop-types": "^15.7.1"
},
"peerDependencies": {
"react": "^16.8.4",
"react-dom": "^16.8.4"
"react": "^16.8.5",
"react-dom": "^16.8.5"
},
"devDependencies": {
"@babel/cli": "^7.2.3",
Expand Down Expand Up @@ -72,9 +72,9 @@
"lint-staged": "^8.1.3",
"node-sass": "^4.11.0",
"node-sass-tilde-importer": "^1.0.2",
"react": "16.8.4",
"react-dom": "16.8.4",
"react-test-renderer": "16.8.4",
"react": "16.8.5",
"react-dom": "16.8.5",
"react-test-renderer": "16.8.5",
"rollup": "^1.1.2",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-replace": "^2.1.0",
Expand All @@ -89,7 +89,7 @@
"tslint": "^5.12.1",
"tslint-config-prettier": "^1.18.0",
"tslint-microsoft-contrib": "^6.1.0",
"tslint-react": "^3.6.0",
"tslint-react": "^4.0.0",
"typescript": "3.3.3",
"typescript-tslint-plugin": "^0.3.1"
},
Expand Down

0 comments on commit 7e05966

Please sign in to comment.