Otto Winter c3a3c038ac Merge branch 'dev' into custom-sensor ... # Conflicts: # esphomeyaml-edge/logo.png # esphomeyaml/components/light/__init__.py # esphomeyaml/pins.py		2018-11-26 20:45:38 +01:00
..
__init__.py	Update	2018-11-19 22:12:24 +01:00
sntp.py	Merge branch 'dev' into custom-sensor	2018-11-26 20:45:38 +01:00