merge

pid1 · Apr 24, 2015 · b5d7c05 · b5d7c05
2 parents c5b5bff + 97f4a95
commit b5d7c05
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java
@@ -56,7 +56,7 @@ public void setDesiredTempForSerialNumber(String serialnumber, String desiredtem
 	}
 
 	public String getDevicesFromEmail(String email){
-		return null;
+		return this.getUserFromEmail(email).get("devices");
 	}