Dan Schaper 8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks ...

# Conflicts:
#	advanced/Scripts/update.sh
#	automated install/basic-install.sh

2016-11-02 06:57:33 -07:00

..

basic-install.sh

Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks

2016-11-02 06:57:33 -07:00

uninstall.sh

remove bad {

2016-10-21 23:59:31 -07:00