Merge branch 'master' into next

Conflicts:
	source/_components/camera.netatmo.markdown
	source/_components/rollershutter.wink.markdown
	source/_components/sensor.netatmo.markdown
	source/_components/sensor.snmp.markdown
	source/_posts/2016-06-18-pandora-bt-home-hub-5-and-local-file-camera.markdown
	source/index.html
This commit is contained in:
Paulus Schoutsen 2016-07-01 00:30:08 -07:00
commit d8de600fe3
51 changed files with 574 additions and 105 deletions

View file

@ -8,9 +8,9 @@ comments: false
sharing: true
footer: true
logo: network-snmp.png
ha_category: Sensor
ha_category: Sensor
ha_iot_class: "Local Polling"
ha_release: "0.21"
ha_release: "0.22"
---