Merge branch 'master' into develop

This commit is contained in:
kaltokri
2023-11-11 16:06:52 +01:00
14 changed files with 284 additions and 1 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