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
-1
View File
@@ -10,7 +10,6 @@ describe('react-webpack generator', function() {
var react;
var expected = [
'src/favicon.ico',
'src/styles/normalize.css',
'src/styles/main.css',
'src/index.html',
'Gruntfile.js',