mirror of
https://github.com/home-assistant/core.git
synced 2025-07-17 18:27:09 +00:00
Merge remote-tracking branch 'origin/rc' into dev
This commit is contained in:
commit
e5d76c53fb
@ -24,7 +24,7 @@ from homeassistant.core import callback
|
||||
from homeassistant.helpers.translation import async_get_translations
|
||||
from homeassistant.loader import bind_hass
|
||||
|
||||
REQUIREMENTS = ['home-assistant-frontend==20180326.0']
|
||||
REQUIREMENTS = ['home-assistant-frontend==20180330.0']
|
||||
|
||||
DOMAIN = 'frontend'
|
||||
DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log']
|
||||
|
@ -1,8 +1,13 @@
|
||||
# coding: utf-8
|
||||
"""Constants used by Home Assistant components."""
|
||||
MAJOR_VERSION = 0
|
||||
<<<<<<< HEAD
|
||||
MINOR_VERSION = 67
|
||||
PATCH_VERSION = '0.dev0'
|
||||
=======
|
||||
MINOR_VERSION = 66
|
||||
PATCH_VERSION = '0b3'
|
||||
>>>>>>> origin/rc
|
||||
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
|
||||
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
|
||||
REQUIRED_PYTHON_VER = (3, 5, 3)
|
||||
|
@ -366,7 +366,7 @@ hipnotify==1.0.8
|
||||
holidays==0.9.4
|
||||
|
||||
# homeassistant.components.frontend
|
||||
home-assistant-frontend==20180326.0
|
||||
home-assistant-frontend==20180330.0
|
||||
|
||||
# homeassistant.components.homematicip_cloud
|
||||
homematicip==0.8
|
||||
|
@ -81,7 +81,7 @@ hbmqtt==0.9.1
|
||||
holidays==0.9.4
|
||||
|
||||
# homeassistant.components.frontend
|
||||
home-assistant-frontend==20180326.0
|
||||
home-assistant-frontend==20180330.0
|
||||
|
||||
# homeassistant.components.influxdb
|
||||
# homeassistant.components.sensor.influxdb
|
||||
|
Loading…
x
Reference in New Issue
Block a user