Skip to content

Commit

Permalink
Merge branch 'release-1.0.62'
Browse files Browse the repository at this point in the history
  • Loading branch information
entrotech committed Nov 20, 2021
2 parents cae5966 + cd3a7e6 commit 6db99dd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 33 deletions.
41 changes: 12 additions & 29 deletions client/package-lock.json

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

6 changes: 3 additions & 3 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "foodoasis-client",
"description": "React Client for Food Oasis",
"version": "1.0.61",
"version": "1.0.62",
"author": "Hack for LA",
"license": "GPL-2.0",
"private": true,
Expand All @@ -19,12 +19,12 @@
},
"dependencies": {
"@craco/craco": "^6.3.0",
"@date-io/moment": "^2.11.0",
"@date-io/moment": "^1.3.13",
"@mapbox/geo-viewport": "^0.4.1",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
"@material-ui/pickers": "^3.2.10",
"@material-ui/pickers": "^3.3.10",
"axios": "^0.21.4",
"classnames": "^2.2.6",
"debounce-fn": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foodoasis-web-api",
"version": "1.0.61",
"version": "1.0.62",
"author": "Hack for LA",
"description": "Web API Server for Food Oasis",
"main": "server.js",
Expand Down

0 comments on commit 6db99dd

Please sign in to comment.