Merge branch 'master' into 'Dev'

# Conflicts:
#   hue_off.py
#   off.lights
This commit is contained in:
rich committed 2017-03-18 20:01:47 -04:00
commit bd3cdfd654
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -276,4 +276,4 @@ def datestamp():
if __name__ == "__main__": if __name__ == "__main__":
main(sys.argv[1:]) main(sys.argv[1:])
+1 -1
View File
@@ -6,4 +6,4 @@ Dining room lamp
Living Room Pharmacy Living Room Pharmacy
Bedroom Bedroom
Porch Porch
Middle Bedroom Ceiling Middle Bedroom Ceiling