Dan Schaper b02730a5ad Merge branches 'development' and 'feature/track_pre-installed_packages' of github.com:pi-hole/pi-hole into feature/track_pre-installed_packages ...

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

# Conflicts:
#	automated install/basic-install.sh

2016-12-27 22:50:00 -08:00

..

basic-install.sh

Merge branches 'development' and 'feature/track_pre-installed_packages' of github.com:pi-hole/pi-hole into feature/track_pre-installed_packages

2016-12-27 22:50:00 -08:00

uninstall.sh

Fix check for lighttpd install before configuration directory removal

2016-12-07 20:31:34 -07:00