jeena/home-assistant.github.io
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'master' into next

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
source/developers/credits.markdown
View file

@ -78,10 +78,11 @@ This page contains a list of people who have contributed in one way or another t
- [Florian Holzapfel](https://github.com/florianholzapfel)
- [fotoetienne](https://github.com/fotoetienne)
- [Fredrik Haglund](https://github.com/PetitCircuitLab)
- [Fredrik Lindqvist](https://github.com/Landrash)
- [GadgetReactor](https://github.com/GadgetReactor)
- [Geoff Norton](https://github.com/kangaroo)
- [goir](https://github.com/goir)
- [gottsman](https://github.com/gottsman)
- [Kevin Gottsman](https://github.com/gottsman)
- [Greg Dowling](https://github.com/pavoni)
- [Guillem Barba](https://github.com/gbarba)
- [Gustav Ahlberg](https://github.com/Gyran)
@ -97,6 +98,7 @@ This page contains a list of people who have contributed in one way or another t
- [Ian Copp](https://github.com/icopp)
- [Igor Shults](https://github.com/ishults)
- [Issac Kelly](https://github.com/issackelly)
- [Jacob Tomlinson](https://github.com/jacobtomlinson)
- [James Cole](https://github.com/jamespcole)
- [Jan Harkes](https://github.com/jaharkes)
- [Jan-Preben Mossin](https://github.com/jpmossin)