Merge branch 'master' into dev

This commit is contained in:
Juan Pablo Arce
2021-12-03 13:19:15 -03:00

2
.gitignore vendored
View File

@@ -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