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

Conflicts:
	homeassistant/const.py
pull/2184/head
Paulus Schoutsen 2016-05-30 10:40:50 -07:00
commit 11cc065845
1 changed files with 3 additions and 1 deletions

View File

@ -1,4 +1,6 @@
Make sure you run the latest version before reporting an issue. Feature requests should go in the forum: https://community.home-assistant.io/c/feature-requests
Make sure you are running the latest version of Home Assistant before reporting an issue.
You should only file an issue if you found a bug. Feature and enhancement requests should go in [the Feature Requests section](https://community.home-assistant.io/c/feature-requests) of our community forum:
**Home Assistant release (`hass --version`):**