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

Browse Source

Conflicts:
	homeassistant/const.py

...

This commit is contained in:

Paulus Schoutsen

2016-06-07 19:27:23 -07:00

parent 3e09a7360e 6c5efd5b7e

commit 31489a56db

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