Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Applevangelist
2023-11-12 12:14:38 +01:00
38 changed files with 525 additions and 88 deletions

2
.gitignore vendored
View File

@@ -42,6 +42,8 @@ local.properties
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
.vscode
# User-specific files
*.suo
*.user