Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@LucasTonetto
LucasTonetto committed Jun 22, 2021
2 parents 67b86ea + 520cfea commit b95b6ed
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 49 deletions.
139 changes: 95 additions & 44 deletions package-lock.json
View file

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

10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"@types/bunyan": "^1.8.6",
"body-parser": "^1.19.0",
"bunyan": "^1.8.15",
"convert-csv-to-json": "0.0.15",
"convert-csv-to-json": "1.3.0",
"cors": "^2.8.5",
"dotenv": "^8.2.0",
"dotenv": "^10.0.0",
"express": "^4.17.1",
"express-fileupload": "^1.2.0",
"express-validator": "^6.11.1",
Expand All @@ -74,13 +74,13 @@
"remark": "^13.0.0"
},
"devDependencies": {
"@types/chai": "^4.2.14",
"@types/chai": "^4.2.19",
"@types/cors": "^2.8.9",
"@types/express": "^4.17.11",
"@types/express-fileupload": "^1.1.6",
"@types/mocha": "^8.2.2",
"@typescript-eslint/eslint-plugin": "^4.27.0",
"@typescript-eslint/parser": "^4.22.1",
"@typescript-eslint/eslint-plugin": "^4.28.0",
"@typescript-eslint/parser": "^4.28.0",
"chai": "^4.2.0",
"eslint": "^7.12.1",
"eslint-config-prettier": "^6.15.0",
Expand Down

0 comments on commit b95b6ed

Please sign in to comment.