Resolved merge conflict

This commit is contained in:
2020-06-07 16:34:00 +02:00
10 changed files with 599 additions and 8 deletions

View File

@@ -8,6 +8,7 @@
},
"dependencies": {
"express": "^4.17.1",
"mongoose": "^5.9.17",
"nodemailer": "^6.4.6",
"puppeteer": "^3.0.4"
}