Merge remote-tracking branch 'origin/master'

mjackson · mjackson · commit b9416bcf221a · 2014-10-12T17:12:42.000-07:00
diff --git a/scripts/dev-examples b/scripts/dev-examples
@@ -1,2 +1,2 @@
 #!/bin/sh
-webpack-dev-server --inline --content-base examples/
+node_modules/.bin/webpack-dev-server --inline --content-base examples/

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/sh`
`2`		`-webpack-dev-server --inline --content-base examples/`
	`2`	`+node_modules/.bin/webpack-dev-server --inline --content-base examples/`