Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper-coveralls-2.11.16
Browse files Browse the repository at this point in the history
  • Loading branch information
mseemann committed Feb 20, 2017
2 parents 3138e4f + b9385ae commit 9f37a48
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -36,7 +36,7 @@
"codeclimate-test-reporter": "0.4.1",
"core-js": "2.4.1",
"coveralls": "2.11.16",
"istanbul-instrumenter-loader": "1.2.0",
"istanbul-instrumenter-loader": "2.0.0",
"jasmine-core": "2.5.2",
"jsdoc": "3.4.3",
"karma": "1.5.0",
Expand All @@ -51,8 +51,8 @@
"source-map-loader": "0.1.6",
"ts-helpers": "1.1.2",
"ts-loader": "1.3.3",
"tslint": "4.2.0",
"tslint-loader": "3.3.0",
"tslint": "4.4.1",
"tslint-loader": "3.4.1",
"typescript": "2.1.4",
"typings": "2.1.0",
"webpack": "1.14.0"
Expand Down

0 comments on commit 9f37a48

Please sign in to comment.