Merge branch 'dev' into refactor-media-player

Conflicts:
	homeassistant/components/frontend/version.py
This commit is contained in:
Paulus Schoutsen
2015-06-08 23:08:00 -07:00
9 changed files with 1593 additions and 1235 deletions

View File

@@ -1,2 +1,2 @@
""" DO NOT MODIFY. Auto-generated by build_frontend script """
VERSION = "464ae07e4263837b88b3e5bda062eaed"
VERSION = "17c8913244cf7359d3e107501e6ca373"