Merge branch 'master' into 'faisal'
# Conflicts: # src/api/index.js
Showing
... | ... | @@ -8,6 +8,7 @@ |
"@date-io/moment": "^2.8.0", | ||
"@material-ui/core": "^4.11.0", | ||
"@material-ui/icons": "^4.9.1", | ||
"@material-ui/lab": "^4.0.0-alpha.56", | ||
"@material-ui/pickers": "^3.2.10", | ||
"@testing-library/jest-dom": "^4.2.4", | ||
"@testing-library/react": "^9.5.0", | ||
... | ... |
This diff is collapsed.
Please register or sign in to comment