Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-20 21a1542f9d99466b2aedd0992a1032b37b4154a3

 System/Dungeon/TrialRewardsBehaviour.cs.meta

copy from System/Role/RolePoint.cs.meta
copy to System/Dungeon/TrialRewardsBehaviour.cs.meta
File was copied from System/Role/RolePoint.cs.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 77a6a757b99422846bb5b68b65b5af18
timeCreated: 1502422861
licenseType: Free
guid: f436f3dabd50bc5429d2de289d60fdd5
timeCreated: 1534749125
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []