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 remote-tracking branch 'newtriks/master'

Browse Source 
Conflicts:
	README.md
This commit is contained in:
Chris
2015-05-26 10:15:03 +02:00
parent 15fde19fa2 e0058bea05
commit e90aaa46b6
10 changed files with 70 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/common/_package.json
+2 -1
View File
@@ -14,7 +14,8 @@
"flux": "^2.0.1",
"events": "^1.0.2",
"object-assign": "^2.0.0", <% } if (architecture === 'reflux') {%>
"reflux": "^0.2.7", <% } %>
"reflux": "^0.2.7", <% } if (architecture === 'alt') { %>
"alt": "^0.16.5", <% } %>
"react": "~0.12.2",
"normalize.css": "~3.0.3"
},