Merge branch 'current' into next

2017-09-30 13:30:14 +02:00 · 2017-09-30 13:30:14 +02:00 · c8ec8391f4
commit c8ec8391f4
parent f2373f8eae 8a729176c7
190 changed files with 787 additions and 379 deletions
--- a/source/_components/climate.wink.markdown
+++ b/source/_components/climate.wink.markdown
@ -31,6 +31,6 @@ The requirement is that you have setup [Wink](/components/wink/).
 - Rheem Econet water heaters (No Wink hub required)

 <p class='note'>
-The above devices are confimed to work, but others may work as well.
+The above devices are confirmed to work, but others may work as well.
 </p>