Merge branch 'hotfix/3.6.2'

yukuku · Jul 24, 2014 · c25788e · c25788e
2 parents f9f7e4e + 17bb904
commit c25788e
Show file tree

Hide file tree

Showing 27 changed files with 307 additions and 394 deletions.
diff --git a/Alkitab/AndroidManifest.xml b/Alkitab/AndroidManifest.xml
@@ -3,8 +3,8 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="yuku.alkitab.debug"
           android:installLocation="auto"
-          android:versionCode="155"
-          android:versionName="3.6.1">
+          android:versionCode="156"
+          android:versionName="3.6.2">
     <uses-sdk android:minSdkVersion="7"
               android:targetSdkVersion="19"/>
 

diff --git a/Alkitab/assets/help/html-in/index.html b/Alkitab/assets/help/html-in/index.html
diff --git a/Alkitab/res/drawable-xhdpi/beta_ribbon.png b/Alkitab/res/drawable-xhdpi/beta_ribbon.png