Merge remote-tracking branch 'origin/master'
# Conflicts: # src/models/user.js
Showing
... | ... | @@ -14,6 +14,7 @@ |
"babel-runtime": "^6.9.2", | ||
"dva": "^1.2.1", | ||
"dva-loading": "^0.2.1", | ||
"egg-init": "^1.8.1", | ||
"rc-queue-anim": "^0.13.3", | ||
"react": "^15.4.0", | ||
"react-addons-transition-group": "^15.4.2", | ||
... | ... |
Please register or sign in to comment