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

2
source/_components/switch.flux.markdown
View file

@ -19,7 +19,7 @@ During the day (in between `start time` and `sunset time`), it will fade the lig
If you don't wish to have flux update on 30 second intervals, you can leave the switch turned off and use automation rules that call the service `switch.flux_update` whenever you want the lights updated.
To use your TPLink switch in your installation, add the following to your `configuration.yaml` file:
To use the Flux switch in your installation, add the following to your `configuration.yaml` file:
```yaml
# Example configuration.yaml entry