jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-09 19:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	homeassistant/components/frontend/version.py
This commit is contained in:
Paulus Schoutsen
2015-06-10 23:53:18 -07:00
parent ae847994fc ca373b5aa5
commit 492ea478e7
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/frontend/version.py
View File

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