Otto Winter e7d8597175 Merge branch 'current' into custom-sensor ... # Conflicts: # esphomeyaml/components/sensor/custom.rst # esphomeyaml/guides/getting_started_hassio.rst		2018-12-05 10:04:53 +01:00
..
index.rst	Merge branch 'current' into custom-sensor	2018-12-05 10:04:53 +01:00