Merge branch 'release/3.0' into develop

Conflicts: .gitattributes build.gradle
wordpress-mobile · Aug 1, 2014 · ecb5fe3 · ecb5fe3
2 parents 68a03de + 813f9d7
commit ecb5fe3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,5 @@
 * text=auto !eol
+*.sh text eol=lf
 *.bat text eol=crlf
 *.png binary
 *.jpg binary
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -37,8 +37,8 @@ android {
 
     defaultConfig {
         applicationId "org.wordpress.android"
-        versionName "3.0-rc-2"
-        versionCode 122
+        versionName "3.0"
+        versionCode 123
         minSdkVersion 14
         targetSdkVersion 19
 

diff --git a/build.gradle b/build.gradle
@@ -0,0 +1 @@
+