Merge remote-tracking branch 'origin-valor-software/development' into development

This commit is contained in:
Marvin Scharle
2016-06-02 00:21:37 +02:00

View File

@@ -63,14 +63,14 @@
"compression-webpack-plugin": "0.3.1",
"conventional-changelog-cli": "1.2.0",
"conventional-github-releaser": "1.1.2",
"copy-webpack-plugin": "2.1.3",
"copy-webpack-plugin": "3.0.1",
"cpy-cli": "1.0.1",
"del": "^2.2.0",
"del-cli": "0.2.0",
"es6-promise": "3.1.2",
"es6-shim": "0.35.0",
"es7-reflect-metadata": "1.6.0",
"eslint-config-valorsoft": "0.0.14",
"eslint-config-valorsoft": "0.0.15",
"exports-loader": "0.6.3",
"file-loader": "0.8.5",
"gh-pages": "0.11.0",
@@ -78,7 +78,7 @@
"gulp-size": "2.1.0",
"gulp-tslint": "5.0.0",
"html-loader": "0.4.3",
"html-webpack-plugin": "2.16.1",
"html-webpack-plugin": "2.19.0",
"istanbul-instrumenter-loader": "0.2.0",
"jasmine": "2.4.1",
"karma": "0.13.22",
@@ -92,7 +92,7 @@
"lite-server": "2.2.0",
"markdown-loader": "0.1.7",
"marked": "0.3.5",
"ng2-bootstrap": "1.0.16",
"ng2-bootstrap": "1.0.17",
"phantomjs-polyfill": "0.0.2",
"phantomjs-prebuilt": "2.1.7",
"pre-commit": "1.1.3",
@@ -103,7 +103,7 @@
"require-dir": "0.3.0",
"rxjs": "5.0.0-beta.6",
"source-map-loader": "0.1.5",
"systemjs-builder": "0.15.17",
"systemjs-builder": "0.15.18",
"ts-loader": "0.8.2",
"tslint-config-valorsoft": "1.0.3",
"typescript": "1.8.10",