Skip to content

Commit

Permalink
Merge branch 'master' into webpack-font-support
Browse files Browse the repository at this point in the history
  • Loading branch information
stefannegele authored Aug 23, 2016
2 parents 06989a5 + 5ac060b commit dde7bc6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@types/lodash": "^4.0.25-alpha",
"@types/rimraf": "0.0.25-alpha",
"@types/webpack": "^1.12.22-alpha",
"angular2-template-loader": "^0.4.0",
"angular2-template-loader": "^0.5.0",
"awesome-typescript-loader": "^2.2.1",
"chalk": "^1.1.3",
"compression-webpack-plugin": "^0.3.1",
Expand Down

0 comments on commit dde7bc6

Please sign in to comment.