Merge branch 'master' into dev

Browse Source

Conflicts:
	homeassistant/const.py

pull/1996/head

Paulus Schoutsen 2016-05-06 21:46:50 -07:00

parent fb3b3db04e 1d3c6da6c8

commit 713c7a5fd7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available