Merge from upstream/master and resolve merge conflicts.

This commit is contained in:
Justin Niessner committed 2015-04-02 15:38:38 -04:00
commit 7721c59253
10 files changed
+9 -438

No files matched your search

-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',