Merge from upstream/master and resolve merge conflicts.

This commit is contained in:
Justin Niessner
2015-04-02 15:38:38 -04:00
10 changed files with 9 additions and 438 deletions
-2
View File
@@ -124,9 +124,7 @@ ReactWebpackGenerator.prototype.packageFiles = function () {
ReactWebpackGenerator.prototype.styleFiles = function styleFiles() {
var mainFile = 'main.css';
var normalizeFile = 'normalize.css';
this.copy('styles/' + mainFile, 'src/styles/' + mainFile);
this.copy('styles/' + normalizeFile, 'src/styles/' + normalizeFile);
};
ReactWebpackGenerator.prototype.imageFiles = function () {