Merge remote-tracking branch 'origin/dev' into refactor-media-player

Conflicts:
	homeassistant/components/frontend/version.py
This commit is contained in:
Paulus Schoutsen 2015-06-10 23:53:18 -07:00
commit 492ea478e7
5 changed files with 31 additions and 31 deletions

View file

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