Merge branch 'master' of ssh://192.168.1.116:29418/bolan-root/frontend/manager-app-sz into wq
# Conflicts:
# ios/bolanManagerApp.xcodeproj/project.pbxproj
# src/utils/config.js
正在显示
.idea/AwesomeProject.iml
deleted
100644 → 0
.idea/compiler.xml
deleted
100644 → 0
.idea/misc.xml
deleted
100644 → 0
.idea/modules.xml
deleted
100644 → 0
.idea/vcs.xml
deleted
100644 → 0
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
android/.idea/gradle.xml
deleted
100644 → 0
android/.idea/misc.xml
deleted
100644 → 0
android/app/app.iml
deleted
100644 → 0
差异被折叠。
... | ... | @@ -23,6 +23,7 @@ |
"scripts": { | ||
"start": "react-native start", | ||
"android": "react-native run-android", | ||
"android-bundle": "react-native bundle --platform android --entry-file index.js --reset-cache --bundle-output android/app/src/main/assets/index.android.bundle --dev false --assets-dest android/app/src/main/res/", | ||
"ios": "react-native run-ios", | ||
"test": "node node_modules/jest/bin/jest.js --watch", | ||
"lint": "eslint --ext .js src test", | ||
... | ... | @@ -41,6 +42,7 @@ |
"rc-form": "^1.4.8", | ||
"react": "^16.0.0-beta.5", | ||
"react-native": "^0.49.3", | ||
"react-native-code-push": "^5.1.3-beta", | ||
"react-native-device-info": "^0.12.1", | ||
"react-native-splash-screen": "^3.0.6", | ||
"react-native-vector-icons": "^4.4.2", | ||
... | ... |
请
注册
或者
登录
后发表评论