Merge branch 'current' into next

This commit is contained in:
Robbie Trencheny 2016-10-05 15:44:06 -07:00
commit afdd04e844
63 changed files with 290 additions and 226 deletions

View file

@ -7,7 +7,7 @@ sidebar: true
comments: false
sharing: true
footer: true
logo:
logo: graphite.png
ha_category: History
ha_release: 0.13
---