merged with 0.10.12 - greylisting still needs work

This commit is contained in:
2020-01-21 12:54:21 +01:00
592 changed files with 66026 additions and 55857 deletions

5
.gitignore vendored
View File

@@ -1,7 +1,9 @@
install/update.log
templates/*
lib/userdata.inc.php
lib/userdata.inc.php.bak
logs/*
!logs/index.html
.buildpath
.project
.settings/
@@ -11,8 +13,9 @@ logs/*
.idea
*.iml
!templates/Maketank/
!templates/Froxlor/
!templates/Sparkle/
!templates/misc/
templates/Froxlor/assets/img/logo_custom.png
!templates/Maketank/
vendor/