mirror of
https://github.com/C9Glax/tranga.git
synced 2025-06-12 06:27:54 +02:00
Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into Server-V2
# Conflicts: # .gitignore
This commit is contained in:
5
.gitignore
vendored
5
.gitignore
vendored
@ -21,4 +21,7 @@ cover.jpg
|
||||
cover.png
|
||||
/.vscode
|
||||
/.vs/
|
||||
Tranga/Properties/launchSettings.json
|
||||
Tranga/Properties/launchSettings.json
|
||||
/Manga
|
||||
/settings
|
||||
*.DotSettings.user
|
Reference in New Issue
Block a user