Merge branch 'release/3.1' into develop

maxme · maxme · commit efd05013cb63 · 2014-08-22T18:49:12.000+02:00
diff --git a/WordPressUtils/build.gradle b/WordPressUtils/build.gradle
@@ -32,8 +32,7 @@ android {
 
     defaultConfig {
         applicationId "org.wordpress.android.util"
-        versionName "1.1.0"
-        versionCode 1
+        versionName "1.2.0"
         minSdkVersion 14
         targetSdkVersion 19
     }

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,7 @@ android {`
`32`	`32`
`33`	`33`	`defaultConfig {`
`34`	`34`	`applicationId "org.wordpress.android.util"`
`35`		`- versionName "1.1.0"`
`36`		`- versionCode 1`
	`35`	`+ versionName "1.2.0"`
`37`	`36`	`minSdkVersion 14`
`38`	`37`	`targetSdkVersion 19`
`39`	`38`	`}`