Adam Warner 22abbffbb7 Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development ...

Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	advanced/Scripts/webpage.sh

2017-06-29 19:47:32 +01:00

..

chronometer.sh

Fix output IPv4 addr when removing CIDR notation (#1498)

2017-05-26 09:57:27 +02:00

COL_TABLE

Colourise Core Output Text (#1471)

2017-06-21 21:49:05 +10:00

list.sh

Strip /* from the end of the IPv6 address

2017-06-24 11:14:23 -04:00

piholeCheckout.sh

Colourise Core Output Text (#1471)

2017-06-21 21:49:05 +10:00

piholeDebug.sh

Log and echo gateway responses

2017-05-10 22:08:06 -07:00

piholeLogFlush.sh

Colourise Core Output Text (#1471)

2017-06-21 21:49:05 +10:00

setupLCD.sh

update license to EUPL on core files

2017-02-22 11:55:20 -06:00

update.sh

Integrate DL's update.sh fixes.

2017-06-25 14:39:09 -07:00

version.sh

Merge branch 'development' into tweak/help-output

2017-05-14 13:03:33 +10:00

webpage.sh

Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development

2017-06-29 19:47:32 +01:00