Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/react-toastify-7.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
newerton authored Mar 21, 2021
2 parents fb388be + 0557dad commit 9c5547b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"date-fns-tz": "^1.0.7",
"history": "^4.9.0",
"immer": "^8.0.1",
"polished": "^3.4.1",
"polished": "^4.1.1",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-icons": "^3.7.0",
"react-perfect-scrollbar": "^1.5.3",
"react-redux": "^7.1.0",
Expand Down Expand Up @@ -55,15 +55,15 @@
"babel-eslint": "^10.0.2",
"customize-cra": "^1.0.0",
"eslint": "^5.16.0",
"eslint-config-airbnb": "^17.1.1",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^6.0.0",
"eslint-import-resolver-babel-plugin-root-import": "^1.1.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-react": "^7.14.3",
"eslint-plugin-react-hooks": "^1.6.1",
"prettier": "^1.18.2",
"prettier": "^2.2.1",
"react-app-rewired": "^2.1.3"
}
}
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11229,4 +11229,4 @@ yup@^0.27.0:
lodash "^4.17.11"
property-expr "^1.5.0"
synchronous-promise "^2.0.6"
toposort "^2.0.2"
toposort "^2.0.2"

0 comments on commit 9c5547b

Please sign in to comment.