Merge branch 'development' into new/UninstallCleanup

Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	automated install/uninstall.sh
This commit is contained in:
Adam Warner 2017-09-09 18:56:17 +01:00
commit 774c6e8ac0
No known key found for this signature in database
GPG key ID: 03843F6C65554B22
5 changed files with 82 additions and 46 deletions

View file

@ -180,7 +180,6 @@ removeNoPurge() {
${SUDO} rm -f /etc/init.d/pihole-FTL
${SUDO} rm -f /usr/bin/pihole-FTL
echo -e "${OVER} ${TICK} Removed pihole-FTL"
fi