Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	homeassistant/bootstrap.py
	homeassistant/components/frontend/version.py
	homeassistant/const.py
This commit is contained in:
Paulus Schoutsen committed 2016-04-19 22:53:26 -07:00
commit 4abbbf0f50
3 files changed
+10 -11

No files matched your search

+1 -1
View File
@@ -1,2 +1,2 @@
"""DO NOT MODIFY. Auto-generated by build_frontend script."""
VERSION = "ffd8a1bde5ba13f300c3d6ad32036526"
VERSION = "b9460e6bbf5549236815d94f1c1c98b9"