Merge branch 'master' into next

2016-01-12 23:15:23 -08:00 · 2016-01-12 23:15:23 -08:00 · 40d33437d7
commit 40d33437d7
parent ef83590a0c 8b777a7008
45 changed files with 68 additions and 21 deletions
--- a/source/_components/automation.markdown
+++ b/source/_components/automation.markdown
@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Automation
 ---