From: David A. Velasco Date: Wed, 11 Dec 2013 07:52:25 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/release-1.5.2' into release-1.5.2 X-Git-Tag: oc-android-1.5.5~106^2~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9fe8cadedd33029ac5da1bf4460f20fefa4fc8b0?hp=c3d88a0594e32043b2599a37789b7ada4a9ac85a Merge remote-tracking branch 'origin/release-1.5.2' into release-1.5.2 --- diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml index 1b12fb49..68eea0a0 100644 --- a/oc_jb_workaround/AndroidManifest.xml +++ b/oc_jb_workaround/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="1.0.11" >