Sync with upstream

399ceba

Sync with upstream
dae53408 · Erick Hitter · 38a5b77f · dae53408 · dae53408 · dae53408
Verified Commit dae53408 authored 8 years ago by Erick Hitter
--- a/scenes/dining-area-nightlight.yaml
+++ b/scenes/dining-area-nightlight.yaml
--- a/scenes/dining-area-read.yaml
+++ b/scenes/dining-area-read.yaml
--- a/scenes/dining-area-relax.yaml
+++ b/scenes/dining-area-relax.yaml
--- a/scenes/ericks-desk-lamp-blink-long.yaml
+++ b/scenes/ericks-desk-lamp-blink-long.yaml
--- a/scenes/ericks-desk-lamp-blink-short.yaml
+++ b/scenes/ericks-desk-lamp-blink-short.yaml
--- a/scenes/ericks-desk-lamp-nightlight.yaml
+++ b/scenes/ericks-desk-lamp-nightlight.yaml
--- a/scenes/ericks-desk-lamp-relax.yaml
+++ b/scenes/ericks-desk-lamp-relax.yaml
--- a/scenes/living-room-bright.yaml
+++ b/scenes/living-room-bright.yaml
--- a/scenes/living-room-concentrate.yaml
+++ b/scenes/living-room-concentrate.yaml
--- a/scenes/living-room-dimmed.yaml
+++ b/scenes/living-room-dimmed.yaml
--- a/scenes/living-room-nightlight.yaml
+++ b/scenes/living-room-nightlight.yaml
--- a/scenes/living-room-read.yaml
+++ b/scenes/living-room-read.yaml
--- a/scenes/living-room-relax.yaml
+++ b/scenes/living-room-relax.yaml
--- a/scenes/master-bath-bright.yaml
+++ b/scenes/master-bath-bright.yaml
--- a/scenes/master-bath-concentrate.yaml
+++ b/scenes/master-bath-concentrate.yaml
--- a/scenes/master-bath-dimmed.yaml
+++ b/scenes/master-bath-dimmed.yaml
--- a/scenes/master-bath-nightlight.yaml
+++ b/scenes/master-bath-nightlight.yaml
--- a/scenes/master-bath-read.yaml
+++ b/scenes/master-bath-read.yaml
--- a/scenes/master-bath-relax.yaml
+++ b/scenes/master-bath-relax.yaml
--- a/scenes/master-bedroom-bright.yaml
+++ b/scenes/master-bedroom-bright.yaml