hass-core/homeassistant
Paulus Schoutsen 71157dbec9 Merge branch 'master' into dev
Conflicts:
	homeassistant/components/frontend/version.py
	homeassistant/components/frontend/www_static/core.js.gz
	homeassistant/components/frontend/www_static/frontend.html
	homeassistant/components/frontend/www_static/frontend.html.gz
	homeassistant/components/frontend/www_static/service_worker.js
	homeassistant/components/frontend/www_static/service_worker.js.gz
	homeassistant/const.py
2016-06-18 12:00:38 -07:00
..
components Merge branch 'master' into dev 2016-06-18 12:00:38 -07:00
helpers Tweak event helper 2016-06-12 20:37:37 -07:00
startup Fix packaging issues 2015-10-10 10:33:09 -07:00
util Removed webcolors dependency in favor of dictionary lookup. () 2016-06-08 22:25:32 -07:00
__init__.py Fix PEP257 issues 2016-03-08 00:06:04 +01:00
__main__.py Remove print (already covered by logger) () 2016-05-31 14:02:31 -07:00
bootstrap.py redirect daemon file descriptors () 2016-05-19 23:20:07 -07:00
config.py Correct celcius to celsius () 2016-04-19 20:30:44 -07:00
const.py Hotfix 21 2 () 2016-06-14 19:54:09 -07:00
core.py Allow for restart without using parent/child processes. () 2016-05-19 23:20:59 -07:00
exceptions.py Fix PEP257 issues 2016-03-08 00:06:04 +01:00
loader.py Add automation config validation 2016-04-04 12:18:58 -07:00
remote.py Revert "Report whether SSL is required in discovery" 2016-06-01 22:37:16 -07:00