Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2016-10-02 15:05:41 -07:00
commit 636e5c12f2
116 changed files with 335 additions and 2935 deletions

View file

@ -28,5 +28,5 @@ Configuration variables:
- **host** (*Optional*): The IP address of the Pi-Hole system. Defaults to `localhost`.
- **ssl** (*Optional*): If `true`, use SSL/TLS to connect to the Pi-Hole system. Defaults to `False`.
- **verify_ssl** (*Optional*): Verify the certification of the system. Default to True.
- **verify_ssl** (*Optional*): Verify the certification of the system. Default to `True`.