Merge branch 'master' into philips-hue

This commit is contained in:
Stephen Yeargin
2015-06-27 00:28:28 -05:00
8 changed files with 524 additions and 22 deletions

View File

@@ -27,6 +27,14 @@
"name": "Phillips Hue",
"ip_address": "127.0.0.1",
"username": "252deadbeef0bf3f34c7ecb810e832f"
},
{
"platform": "ISY",
"name": "ISY",
"host": "192.168.1.20",
"port": "8000",
"username": "username",
"password": "password"
}
],