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

Browse Source

Conflicts:
	homeassistant/const.py

...

This commit is contained in:

Paulus Schoutsen

2016-05-19 22:32:34 -07:00

parent 631ba2ef0d fd8240241f

commit 32f97dc578

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