Merge branch 'master' of https://github.com/webpack/webpack

sokra · sokra · commit c2d1fcaeb30d · 2014-09-23T00:02:16.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "1.4.1-beta1",
+	"version": "1.4.2",
 	"author": "Tobias Koppers @sokra",
 	"description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",
 	"dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "1.4.1-beta1",`
	`3`	`+ "version": "1.4.2",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",`
`6`	`6`	`"dependencies": {`