Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:softrams/bulwark into jira
Browse files Browse the repository at this point in the history
  • Loading branch information
alejandrosaenz117 committed Aug 6, 2020
2 parents d2e1c81 + 523519a commit 399a618
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions frontend/package-lock.json

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

4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular/language-service": "~10.0.7",
"@types/jasmine": "~3.5.11",
"@angular/language-service": "~10.0.8",
"@types/jasmine": "~3.5.12",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^14.0.27",
"codelyzer": "^6.0.0",
Expand Down
20 changes: 10 additions & 10 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@
},
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.11.0",
"@babel/core": "^7.11.1",
"@babel/preset-env": "^7.11.0",
"@babel/preset-typescript": "^7.10.4",
"@commitlint/cli": "^9.1.2",
"@commitlint/config-conventional": "^9.1.1",
"@types/jest": "^26.0.8",
"@types/jest": "^26.0.9",
"babel-jest": "^26.2.2",
"cz-conventional-changelog": "^3.2.0",
"husky": "^4.2.5",
Expand Down

0 comments on commit 399a618

Please sign in to comment.