Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/react-and-react-do…
Browse files Browse the repository at this point in the history
…m-17.0.1
  • Loading branch information
newerton committed Mar 17, 2021
2 parents 84a6382 + 2d10648 commit 3a2f38f
Show file tree
Hide file tree
Showing 2 changed files with 3,823 additions and 2,762 deletions.
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -9,14 +9,14 @@
"axios": ">=0.21.1",
"history": "^4.9.0",
"immer": "^8.0.1",
"polished": "^3.4.1",
"polished": "^4.1.1",
"prop-types": "^15.7.2",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-icons": "^3.7.0",
"react-redux": "^7.1.0",
"react-router-dom": "^5.0.1",
"react-scripts": "3.0.1",
"react-scripts": "4.0.3",
"react-toastify": "^5.3.2",
"reactotron-react-js": "^3.3.2",
"reactotron-redux": "^3.1.1",
Expand Down Expand Up @@ -46,7 +46,7 @@
"devDependencies": {
"babel-eslint": "^10.0.2",
"eslint": "^5.16.0",
"eslint-config-airbnb": "^17.1.1",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-import": "^2.18.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
Expand Down

0 comments on commit 3a2f38f

Please sign in to comment.