Merge branch 'master' into dev

Browse Source

Conflicts:
	homeassistant/const.py
	requirements_all.txt

...

This commit is contained in:

Paulus Schoutsen

2016-04-06 11:51:03 -07:00

parent e8efcd21df d5498dfb83

commit 71196d32bc

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