merged with v0.10.33

This commit is contained in:
2022-03-01 12:29:50 +01:00
221 changed files with 16958 additions and 5289 deletions

3
.gitignore vendored
View File

@@ -12,10 +12,11 @@ logs/*
.well-known
.idea
*.iml
img/
!templates/Maketank/
!templates/Froxlor/
!templates/Sparkle/
!templates/misc/
templates/Froxlor/assets/img/logo_custom.png
templates/Sparkle/assets/css/custom.css
vendor/