evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	homeassistant/components/recorder/__init__.py
	homeassistant/const.py
	requirements_all.txt
	setup.py
This commit is contained in:
Paulus Schoutsen 2016-08-12 18:57:15 -07:00
commit 18829daa65
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
setup.py
View file

@ -26,8 +26,8 @@ setup(
license='MIT License', license='MIT License',
url='https://home-assistant.io/', url='https://home-assistant.io/',
download_url=DOWNLOAD_URL, download_url=DOWNLOAD_URL,
author='Paulus Schoutsen', author='Home Assistant',
author_email='paulus@paulusschoutsen.nl', author_email='hello@home-assistant.io',
description='Open-source home automation platform running on Python 3.', description='Open-source home automation platform running on Python 3.',
packages=PACKAGES, packages=PACKAGES,
include_package_data=True, include_package_data=True,