Merge branch 'master' into next

Conflicts:
	source/_cookbook/custom_panel_using_react.markdown
This commit is contained in:
Paulus Schoutsen 2016-08-13 10:29:41 -07:00
commit 1957efefb8
74 changed files with 845 additions and 311 deletions

View file

@ -9,7 +9,7 @@ sharing: true
footer: true
logo: mpchc.png
ha_category: Media Player
featured: true
featured: false
ha_release: 0.25.0
---