Merge branch 'master' into dev

Browse source

Conflicts:
	homeassistant/const.py

...

This commit is contained in:

Paulus Schoutsen 2016-01-25 22:58:06 -08:00

parent b97de5cef6 a4ee2bd8ef

commit c10a86d1bf

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 is not available