Merge branch 'Regalis11:master' into master

This commit is contained in:
Evil Factory
2021-11-11 13:08:55 -03:00
committed by GitHub

1
.gitignore vendored
View File

@@ -49,6 +49,7 @@ temp.txt
docs/html
# Private assets
Barotrauma/BarotraumaShared/Content/*
Barotrauma/BarotraumaShared/SharedSource/GameAnalyticsKeys.cs
.github/ISSUE_TEMPLATE/release-checklist.md
#Rider