Merge branch 'Regalis11:master' into master

This commit is contained in:
Evil Factory
2021-12-02 12:32:44 -03:00
committed by GitHub
+1 -1
View File
@@ -49,7 +49,7 @@ temp.txt
docs/html docs/html
# Private assets # Private assets
Barotrauma/BarotraumaShared/Content/* Barotrauma/BarotraumaShared/Content/*
Barotrauma/BarotraumaShared/SharedSource/GameAnalyticsKeys.cs Barotrauma/**/GameAnalyticsKeys.cs
.github/ISSUE_TEMPLATE/release-checklist.md .github/ISSUE_TEMPLATE/release-checklist.md
#Rider #Rider