Merge remote-tracking branch 'origin/cherry' into BAE
client/debug.log
deleted
100644 → 0
client/src/Bookmark.js
0 → 100644
16.3 KB
client/src/Pages/Place.js
0 → 100644
client/src/utils/auth.js
0 → 100644
This diff is collapsed.
... | @@ -24,7 +24,7 @@ | ... | @@ -24,7 +24,7 @@ |
"iconv-lite": "^0.6.2", | "iconv-lite": "^0.6.2", | ||
"jschardet": "^2.2.1", | "jschardet": "^2.2.1", | ||
"mongoose": "^5.11.9", | "mongoose": "^5.11.9", | ||
"nodemon": "^2.0.7", | "query-string": "^6.13.8", | ||
"request": "^2.88.2", | "request": "^2.88.2", | ||
"request-promise": "^4.2.6", | "request-promise": "^4.2.6", | ||
"styled-components": "^5.2.1" | "styled-components": "^5.2.1" | ||
... | ... |