Merge commit '937086d17b266a17ea6bdd144656cd5282fa86d7' into issue/4235-locale-getdefault-usage

maxme · maxme · commit 8c24405a490b · 2016-06-22T16:10:33.000+02:00
diff --git a/WordPressUtils/build.gradle b/WordPressUtils/build.gradle
@@ -32,7 +32,7 @@ android {
     buildToolsVersion "23.0.3"
 
     defaultConfig {
-        versionName "1.9.0"
+        versionName "1.10.0"
         minSdkVersion 14
         targetSdkVersion 23
     }
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java b/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java
@@ -269,4 +269,4 @@ public static String toPlainText(Context context) {
         }
         return sb.toString();
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -269,4 +269,4 @@ public static String toPlainText(Context context) {`
`269`	`269`	`}`
`270`	`270`	`return sb.toString();`
`271`	`271`	`}`
`272`		`-}`
	`272`	`+}`