jfmcarreira/home-assistant-core
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '0-21-1' into dev

Browse Source 
Conflicts:
	homeassistant/components/frontend/www_static/core.js.gz
	homeassistant/components/frontend/www_static/frontend.html.gz
	homeassistant/components/frontend/www_static/service_worker.js.gz
	homeassistant/const.py
	requirements_all.txt
	setup.py
This commit is contained in:
Paulus Schoutsen committed 2016-06-12 00:25:36 -07:00
2 parents 586f69ac95 40be883c0e
commit ebe4c39020
3 files changed
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search