Merge remote-tracking branch 'origin/dev' into dev

Browse Source

Conflicts:
	homeassistant/components/script.py
	homeassistant/helpers/entity_component.py

...

This commit is contained in:

Stefan Jonasson

2015-10-28 21:43:46 +01:00

parent f3500542dd 10c95b4352

commit f74a6ed4c9

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

Diff Content Not Available