Merge branch 'develop' of http://139.196.24.156/ifish/ifish into develop

# Conflicts:
#	.DS_Store
#	Ifish.xcodeproj/project.pbxproj
This commit is contained in:
wbzhan_macbook
2019-03-20 09:35:23 +08:00
18 changed files with 97 additions and 77 deletions
+1 -1
View File
@@ -17640,7 +17640,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "eeefa590-8286-4301-b6e5-f1eeee0de64f";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "";