Merge branch 'master' into dev

Browse Source

Conflicts:
	homeassistant/const.py

...

This commit is contained in:

Paulus Schoutsen

2016-07-12 22:31:54 -07:00

parent ebcda4076e 6f8a733434

commit 3dcafafc6a

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