nate eaf89995ee Merge conflict resolution

2016-03-28 12:59:45 -05:00

..

basic-install.sh

Merge conflict resolution

2016-03-28 12:59:45 -05:00

uninstall.sh

Addressed UAT issues and moved scripts to /opt/pihole

2016-03-28 10:24:13 -05:00