Merge branch 'dev'

Conflicts: build.gradle
jguerinet · Sep 21, 2015 · e021e7c · e021e7c
2 parents 45accfa + 03bfc98
commit e021e7c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -41,6 +41,6 @@ jar {
 }
 
 dependencies {
-    compile 'com.squareup.okhttp:okhttp:2.5z.0'
+    compile 'com.squareup.okhttp:okhttp:2.5.0'
     compile 'net.sf.supercsv:super-csv:2.3.1'
 }