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
..
sonoff_basic.rst	Merge branch 'current' into next	2019-02-07 18:22:22 +01:00