Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2017-05-04 21:49:24 -07:00
commit 0ac6fd0f3f
103 changed files with 1628 additions and 744 deletions

View file

@ -13,5 +13,4 @@ ha_iot_class: "Local Polling"
ha_release: 0.43
---
For installation instructions, see [the Trådfri component][/components/tradfri/].
For installation instructions, see [the Trådfri component](/components/tradfri/).