Skip to content

Commit

Permalink
Merge pull request #19 from KEKDATA/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
TchernyavskyDaniil authored Jun 6, 2020
2 parents 1a2af6e + 067266c commit 9ff1a26
Show file tree
Hide file tree
Showing 28 changed files with 404 additions and 309 deletions.
119 changes: 19 additions & 100 deletions backend/package-lock.json

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

8 changes: 4 additions & 4 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
"@babel/preset-env": "^7.10.2",
"@babel/preset-typescript": "^7.10.1",
"@types/bull": "^3.13.0",
"@types/node": "^14.0.6",
"@types/node": "^14.0.10",
"@types/redis": "^2.8.22",
"@types/sequelize": "^4.28.9",
"@types/ws": "^7.2.4",
"@types/ws": "^7.2.5",
"@typescript-eslint/parser": "^3.1.0",
"babel-eslint": "^10.1.0",
"eslint": "^7.1.0",
Expand All @@ -56,14 +56,14 @@
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.1.3",
"husky": "^4.2.5",
"lint-staged": "^10.2.7",
"lint-staged": "^10.2.8",
"prettier": "1.19.1",
"ts-node": "^8.10.2",
"typescript": "^3.9.3",
"@types/cheerio": "^0.22.18",
"@types/natural": "^0.6.3",
"@types/ramda": "^0.27.6",
"electron": "^9.0.1"
"electron": "^9.0.2"
},
"husky": {
"hooks": {
Expand Down
Loading

0 comments on commit 9ff1a26

Please sign in to comment.