Merge branch 'master' of git://192.168.1.116/bolan-root/frontend/manager-app-sz into wq
# Conflicts:
# src/models/login.js
# src/routes/login.js
正在显示
| ... | @@ -38,8 +38,10 @@ | ... | @@ -38,8 +38,10 @@ |
| "fastjson_ref_resolver": "0.0.3", | "fastjson_ref_resolver": "0.0.3", | ||
| "lodash": "latest", | "lodash": "latest", | ||
| "moment": "^2.19.1", | "moment": "^2.19.1", | ||
| "rc-form": "^1.4.8", | |||
| "react": "^16.0.0-beta.5", | "react": "^16.0.0-beta.5", | ||
| "react-native": "^0.49.3", | "react-native": "^0.49.3", | ||
| "react-native-device-info": "^0.12.1", | |||
| "react-navigation": "^1.0.0-beta.14", | "react-navigation": "^1.0.0-beta.14", | ||
| "react-redux": "^5.0.6", | "react-redux": "^5.0.6", | ||
| "redux-persist": "^4.10.1" | "redux-persist": "^4.10.1" | ||
| ... | ... |
src/utils/store.js
0 → 100644
请
注册
或者
登录
后发表评论