Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into Server-V2

# Conflicts:
#	.gitignore
This commit is contained in:
2024-09-09 09:44:36 +02:00
12 changed files with 80 additions and 111 deletions

5
.gitignore vendored
View File

@ -21,4 +21,7 @@ cover.jpg
cover.png
/.vscode
/.vs/
Tranga/Properties/launchSettings.json
Tranga/Properties/launchSettings.json
/Manga
/settings
*.DotSettings.user