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

Merge remote-tracking branch 'origin/master' into next

Browse source 
Conflicts:
	source/getting-started/automation.markdown
This commit is contained in:
Paulus Schoutsen 2016-05-01 23:34:04 -07:00
commit de586c5433
120 changed files with 305 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/_topics/splitting_configuration.markdown
View file

@ -26,7 +26,7 @@ homeassistant:
# Location required to calculate the time the sun rises and sets
latitude: 37
longitude: -121
# C for Celcius, F for Fahrenheit
# C for Celsius, F for Fahrenheit
temperature_unit: F
# Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
time_zone: America/Los_Angeles