gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'ScriptCleanup-Dev'

Browse Source 
Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/piholeDebug.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh
This commit is contained in:
nate
2016-03-28 12:58:44 -05:00
parent a0cf93a7ca a4fbccac9b
commit 2311b42bca
8 changed files with 335 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@@ -3,8 +3,13 @@
##### Designed For Raspberry Pi A+, B, B+, 2, Zero (with an Ethernet adapter), and also works on most Debian based distros!
=======
# Automated Install
<<<<<<< HEAD
##### Designed For Raspberry Pi A+, B, B+, 2, Zero, and 3B (with an Ethernet/Wi-Fi adapter)
>>>>>>> PiholeDebug
=======
##### Designed For Raspberry Pi A+, B, B+, 2, and Zero (with an Ethernet/Wi-Fi adapter)
>>>>>>> ScriptCleanup
>>>>>>> ScriptCleanup-Dev
1. Install Raspbian on Raspberry Pi variants or a Debian based distribution on other hardware or virtual machines
2. Run the command below