Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2

zhujie

10 天以前 88b00f3fc74446a1727c93722c7b64179b45a9db

 .gitignore

@@ -7,9 +7,16 @@
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
/.idea/deploymentTargetSelector.xml
/.idea/gradle.xml
/.idea/misc.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties

.idea/
**/debug/