Cherry picking f6f6f6d, conflict fix

This commit is contained in:
Adam Warner 2016-11-02 09:33:17 +00:00 committed by Dan Schaper
parent 354309fcad
commit 3df2ef8587

View file

@ -943,6 +943,7 @@ updatePihole() {
installPiholeWeb installPiholeWeb
installCron installCron
configureFirewall configureFirewall
finalExports #re-export setupVars.conf to account for any new vars added in new versions
runGravity runGravity
} }