Merge branch 'current' into next

2016-10-05 15:44:06 -07:00 · 2016-10-05 15:44:06 -07:00 · afdd04e844
commit afdd04e844
parent 55e6b5e922 7932beeed7
63 changed files with 290 additions and 226 deletions
--- a/source/_components/zeroconf.markdown
+++ b/source/_components/zeroconf.markdown
@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: avahi.png
 ha_category: "Other"
 ha_release: 0.18
 ---