Merge branch 'pr/635' into dev

Browse source

Conflicts:
	requirements_all.txt

...

This commit is contained in:

Paulus Schoutsen 2015-11-28 00:50:18 -08:00

parent ad3f96fa25 067b5862c0

commit bbfeba0fe4

8 changed files with 475 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

homeassistant/components/frontend/www_static/images/config_ecobee_thermostat.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 30 KiB