Simon Bailey c5aa8e1e1a Merge branch 'exclude-node_modules' of https://github.com/Shraymonks/generator-react-webpack into Shraymonks-exclude-node_modules ...

Signed-off-by: Simon Bailey <simon@newtriks.com>

Conflicts:
	templates/common/_webpack.config.js
	templates/common/_webpack.dist.config.js

2015-02-17 09:55:40 +00:00

..

common

Merge branch 'exclude-node_modules' of https://github.com/Shraymonks/generator-react-webpack into Shraymonks-exclude-node_modules

2015-02-17 09:55:40 +00:00

javascript

fix the require's style path when creating sub-foldered components

2015-02-04 13:29:42 -07:00

spec

Fix warning "Something is calling a React component directly"

2015-01-09 20:29:51 +03:00

styles

add whitespace between style name and opening curly brace

2015-02-01 09:42:23 -07:00