resolved conflicts

This commit is contained in:
myvesta 2024-04-14 22:28:39 +02:00
commit 0d026da7f3
151 changed files with 5312 additions and 407 deletions

View file

@ -22,6 +22,7 @@ restart="$5"
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/func/ipv6.sh
source $VESTA/conf/vesta.conf