Merge branch 'master' into develop-0.10.0

This commit is contained in:
afc163 2015-10-12 10:21:16 +08:00
commit ecb98d8787

View File

@ -87,6 +87,7 @@
"lodash": "^3.10.0",
"nico-jsx": "~0.5.8",
"precommit-hook": "^1.0.7",
"react": "~0.13.0",
"react-router": "1.0.0-rc1",
"webpack": "^1.10.1",
"webpack-dev-middleware": "^1.2.0"