nate f8427ab789 Merge remote-tracking branch 'refs/remotes/pi-hole/development' ...

Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh

2016-03-29 12:57:22 -05:00

..

basic-install.sh

Merge remote-tracking branch 'refs/remotes/pi-hole/development'

2016-03-29 12:57:22 -05:00

uninstall.sh

Check if lighttpd has been uninstalled before removing conf files

2016-03-28 17:08:19 -05:00