Charles Blaxland 4d74f4b061 Merge branch 'feature/template-function' of https://github.com/jantimon/html-webpack-plugin into jantimon-feature/template-function ... Conflicts: index.js		2015-03-30 12:09:09 +11:00
..
fixtures	Rename the assets template to support old templates files	2015-03-11 11:36:55 +01:00
HtmlWebpackPluginSpec.js	Merge branch 'feature/template-function' of https://github.com/jantimon/html-webpack-plugin into jantimon-feature/template-function	2015-03-30 12:09:09 +11:00