Merge branch 'dev' into cleanup

Conflicts:
	.coveragerc
This commit is contained in:
Paulus Schoutsen committed 2015-08-05 06:51:39 -07:00
commit b2cfce7243
35 files changed
+799 -606

No files matched your search

+1 -1
View File
@@ -29,7 +29,7 @@ MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
# Maps discovered services to their platforms
DISCOVERY_PLATFORMS = {
discovery.services.BELKIN_WEMO: 'wemo',
discovery.SERVICE_WEMO: 'wemo',
wink.DISCOVER_SWITCHES: 'wink',
isy994.DISCOVER_SWITCHES: 'isy994',
}