Commit graph

3 commits

Author SHA1 Message Date
Dan Schaper
b8f1c1c69a Merge branches 'development' and 'feature/DOReadme' of github.com:pi-hole/pi-hole into feature/DOReadme
# Conflicts:
#	test/centos.Dockerfile
#	test/debian.Dockerfile
2016-11-19 13:38:42 -08:00
Dan Schaper
53016c6d70 Merge branch 'development' of https://github.com/pi-hole/pi-hole into development 2016-11-08 04:50:08 -08:00
Dan Schaper
1568c9ab3b Change path to remove space 2016-11-04 18:32:10 -07:00
Renamed from automated install/basic-install.sh (Browse further)