Merge branch 'master' into dev
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -48,7 +48,7 @@ temp.txt
|
||||
|
||||
# Private assets
|
||||
Barotrauma/BarotraumaShared/Content/*
|
||||
Barotrauma/BarotraumaShared/SharedSource/GameAnalyticsKeys.cs
|
||||
Barotrauma/**/GameAnalyticsKeys.cs
|
||||
.github/ISSUE_TEMPLATE/release-checklist.md
|
||||
|
||||
#Rider
|
||||
|
||||
Reference in New Issue
Block a user