Mcat12 680d6e2d31 Merge branch 'release/v4.2' into development ...

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

2019-02-03 11:14:09 -08:00

..

basic-install.sh

Merge branch 'release/v4.2' into development

2019-02-03 11:14:09 -08:00

uninstall.sh

Change the word "folder" to "directory" since the pi-hole is intended to run on rpi with Linux on it.

2018-07-28 02:35:39 +10:00