Adam Warner 9e96ff37de Fix merge conflicts ...

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

2020-05-12 22:16:43 +01:00

..

bash-completion

Remove pihole -a hostrecord

2020-04-23 13:20:15 +02:00

GIFs

Multiple gif files to choose from

2015-06-06 23:29:54 -05:00

Scripts

Fix merge conflicts

2020-05-12 22:16:43 +01:00

Templates

Add update to gravity database version 12, renaming the Unassociated group to Default group.

2020-05-07 18:01:37 +02:00

01-pihole.conf

Merge branch 'development' of https://github.com/Mograine/pi-hole into patch-1

2019-11-13 09:44:48 +01:00

blockingpage.css

Assorted typo fixes. (#3126)

2020-03-08 16:53:14 -07:00

cmdline.txt

consoleblank=0

2016-02-20 01:15:14 -06:00

console-setup

file to set lcd font size

2016-01-23 11:48:12 -06:00

dnsmasq.conf.original

Assorted typo fixes. (#3126)

2020-03-08 16:53:14 -07:00

index.php

Fixes broken blocking page and landing page when changing server port and/or hostname.

2020-04-10 12:29:01 -04:00

lighttpd.conf.debian

Serve JS files with utf-8 charset too

2019-12-07 13:48:25 +02:00

lighttpd.conf.fedora

Serve JS files with utf-8 charset too

2019-12-07 13:48:25 +02:00