wassname/generator-react-webpack
1
0
Fork 0
mirror of https://github.com/wassname/generator-react-webpack.git synced 2026-09-09 11:22:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge from upstream/master and resolve merge conflicts.

Browse Source
This commit is contained in:
Justin Niessner
2015-04-02 15:38:38 -04:00
parent 267a632e11 319bf0bdc5
commit 7721c59253
10 changed files with 9 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/javascript/App.js
+1 -1
View File
@@ -4,7 +4,7 @@ var React = require('react/addons');
var ReactTransitionGroup = React.addons.TransitionGroup;
// CSS
require('../../styles/normalize.css');
require('normalize.css');
require('../../styles/main.css');
var imageURL = require('../../images/yeoman.png');