Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts: # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
This commit is contained in:
@@ -99,3 +99,4 @@ InitTestScene*.unity*
|
||||
/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity*
|
||||
ProjectSettings/EditorBuildSettings.asset
|
||||
ProjectSettings/ProjectSettings.asset
|
||||
.idea
|
||||
|
||||
Reference in New Issue
Block a user