Adam Warner 90119c75d5 more merge conflicts!		2017-05-14 16:43:20 +01:00
..
bash-completion	Pi-hole checkout feature	2017-03-08 13:16:40 +01:00
GIFs
Scripts	more merge conflicts!	2017-05-14 16:43:20 +01:00
01-pihole.conf	Add localise-queries flag to 01-pihole.conf	2017-04-30 13:47:07 +02:00
blockingpage.css	Add whitelisting on blocking page feature	2016-12-30 12:03:45 +00:00
cmdline.txt
console-setup
dnsmasq.conf.original
index.js
index.php	whitelist on website blocked doesnt work (#1452)	2017-05-12 22:29:07 +02:00
lighttpd.conf.debian	update license to EUPL on core files	2017-02-22 11:55:20 -06:00
lighttpd.conf.fedora	update license to EUPL on core files	2017-02-22 11:55:20 -06:00
logrotate	Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1)	2017-01-29 19:58:53 +01:00
pihole-FTL.service	Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running	2017-04-12 15:12:09 +02:00
pihole.cron	update license to EUPL on core files	2017-02-22 11:55:20 -06:00
pihole.sudo	update license to EUPL on core files	2017-02-22 11:55:20 -06:00