Skip to content

Commit

Permalink
Merge pull request #146 from MitocGroup/dev
Browse files Browse the repository at this point in the history
#DEEP-TODO Dev to master 06-02-2018
  • Loading branch information
eistrati authored Feb 6, 2018
2 parents c398d7c + 001e5e5 commit a25215c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ src/**/frontend/_build/*
!src/**/frontend/_build/.gitkeep

# Deep related
src/deeploy.json
src/*deeploy.json*
src/*.provisioning.json*
src/**/.parameters.json
src/**/*_config.json
Expand Down
27 changes: 14 additions & 13 deletions src/deep-todomvc/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,25 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^5.0.0",
"@angular/common": "^5.0.0",
"@angular/compiler": "^5.0.0",
"@angular/core": "^5.0.0",
"@angular/forms": "^5.0.0",
"@angular/http": "^5.0.0",
"@angular/platform-browser": "^5.0.0",
"@angular/platform-browser-dynamic": "^5.0.0",
"@angular/router": "^5.0.0",
"@angular/animations": "^5.2.0",
"@angular/common": "^5.2.0",
"@angular/compiler": "^5.2.0",
"@angular/core": "^5.2.0",
"@angular/forms": "^5.2.0",
"@angular/http": "^5.2.0",
"@angular/platform-browser": "^5.2.0",
"@angular/platform-browser-dynamic": "^5.2.0",
"@angular/router": "^5.2.0",
"core-js": "^2.4.1",
"rxjs": "^5.5.2",
"zone.js": "^0.8.14"
"rxjs": "^5.5.6",
"zone.js": "^0.8.19"
},
"devDependencies": {
"@angular/cli": "1.5.0",
"@angular-devkit/core": "^0.2.0",
"@angular/cli": "1.6.7",
"@angular/compiler-cli": "^5.0.0",
"@angular/language-service": "^5.0.0",
"@types/jasmine": "~2.5.53",
"@types/jasmine": "~2.8.x",
"@types/jasminewd2": "~2.0.2",
"@types/node": "~6.0.60",
"codelyzer": "~3.2.0",
Expand Down

0 comments on commit a25215c

Please sign in to comment.