Tim Neutkens 18f8ab392a Merge branch 'master' into canary ... # Conflicts: # examples/with-apollo/lib/initApollo.js # examples/with-apollo/package.json # examples/with-react-with-styles/package.json # examples/with-static-export/package.json # package.json		2017-11-05 11:01:59 +01:00
..
babel	Make styled-jsx configurable (#3050)	2017-10-15 19:54:57 +02:00
loaders	Support webpack harmony modules in self accept (#2510)	2017-07-10 10:10:32 +05:30
plugins	Combine source maps (#3178)	2017-10-30 15:57:35 +01:00
clean.js	allow cleaning from non-cwd (#2451)	2017-07-05 10:49:35 +05:30
index.js	Output webpack build stats as webpack-stats.json (#2828)	2017-10-30 15:55:44 +01:00
replace.js	Refactor the build server to remove tie to fs (#1656)	2017-04-07 09:52:12 -07:00
root-module-relative-path.js	Fix relative module aliases for Windows (#1249)	2017-02-24 04:49:34 +05:30
webpack.js	Merge branch 'master' into canary	2017-11-05 11:01:59 +01:00