Merge remote-tracking branch 'origin/master'

client_Hale

2018-08-13 e3ff72fcec1bdd8d9fd0a2fe69cadd83ac8ded97

1
2
3
4
5
6
7
8
9
fileFormatVersion: 2
guid: a64bbf03a8a36a94f87bf8bd05b10327
folderAsset: yes
timeCreated: 1512098515
licenseType: Pro
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: