Merge branch 'replaced_urls_@tests' of github.com:wakr/tmc-core into …

…replaced_urls_@tests Conflicts: src/main/java/fi/helsinki/cs/tmc/core/domain/Exercise.java src/test/java/fi/helsinki/cs/tmc/core/commands/SubmitTest.java src/test/java/fi/helsinki/cs/tmc/core/communication/ExerciseSubmitterTest.java
testmycode · Sep 12, 2015 · 6d16012 · 6d16012
2 parents d35f7b3 + d0fefdb
commit 6d16012
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/fi/helsinki/cs/tmc/core/domain/Exercise.java b/src/main/java/fi/helsinki/cs/tmc/core/domain/Exercise.java
@@ -29,6 +29,9 @@ public class Exercise implements Serializable {
 
     private String checksum; //: "406f2f0690550c6dea94f319b2b1580c",
 
+    @SerializedName("zip_url")
+    private URI zipUrl;
+
     @SerializedName("return_url")
     private URI returnUrl;