Merge branch 'release/1.0.2' into develop

mcmath · mcmath · commit f48237097516 · 2016-02-08T01:06:51.000-08:00
Fixed minor bug causing tests to fail in Node 5.0, in which callbacks return an
undefined error value on success rather than null.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ejs-html-loader",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Webpack loader for rendering HTML from EJS templates",
   "main": "index.js",
   "files": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ejs-html-loader",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"description": "Webpack loader for rendering HTML from EJS templates",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"files": [`