Otto Winter 6ecc76ba80 Merge branch 'current' into next ... # Conflicts: # Makefile # esphomeyaml/changelog/v1.10.0.rst # esphomeyaml/devices/sonoff_basic.rst # esphomeyaml/index.rst		2019-02-07 18:22:22 +01:00
..
images	Netlify (#153)	2019-02-07 13:54:45 +01:00
bme280_environment.rst	Netlify (#153)	2019-02-07 13:54:45 +01:00
bruh.rst	Netlify (#153)	2019-02-07 13:54:45 +01:00
dual-r2-cover.rst	Netlify (#153)	2019-02-07 13:54:45 +01:00
garage-door.rst	Netlify (#153)	2019-02-07 13:54:45 +01:00
index.rst	Netlify (#153)	2019-02-07 13:54:45 +01:00
pir.rst	Netlify (#153)	2019-02-07 13:54:45 +01:00
power_meter.rst	Netlify (#153)	2019-02-07 13:54:45 +01:00
relay.rst	Netlify (#153)	2019-02-07 13:54:45 +01:00
sonoff-fishpond-pump.rst	Merge branch 'current' into next	2019-02-07 18:22:22 +01:00
temt6000.rst	Netlify (#153)	2019-02-07 13:54:45 +01:00