Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

client_Zxw

2018-08-28 2cfc54da70f0639f662d2cd8ce08c69d813e9bd2

 Assets/Plugins/iOS/The2thWorldSDK/FreeSDK/FreeSDKResource.bundle/Entry.storyboardc/YLQuickRegisterSuccessViewController~ipad.nib.meta

copy from Assets/Editor/Logo/lxj.meta
copy to Assets/Plugins/iOS/The2thWorldSDK/FreeSDK/FreeSDKResource.bundle/Entry.storyboardc/YLQuickRegisterSuccessViewController~ipad.nib.meta
File was copied from Assets/Editor/Logo/lxj.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 01e005808a839ab41a7de35f6d789e60
guid: b2e760638f8fc01499aa875aca37c539
folderAsset: yes
timeCreated: 1533884522
timeCreated: 1535003964
licenseType: Free
DefaultImporter:
  userData: