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

..

config.json

Merge branch 'dev' into custom-sensor

2018-11-26 20:45:38 +01:00

icon.png

Add Logo and Icon to HassIO add-on (#241)

2018-11-23 13:51:39 +01:00

logo.png

Add Logo and Icon to HassIO add-on (#241)

2018-11-23 13:51:39 +01:00