From: jabarros Date: Tue, 20 Jan 2015 08:25:20 +0000 (+0100) Subject: Merge branch 'develop' into SettingsGreyedOut X-Git-Tag: oc-android-1.7.0_signed~32^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d0cee8be8556d1db46ec6193b209f9ffdae104d0?hp=99276bae85de946bea62116a0455275804e02fe8 Merge branch 'develop' into SettingsGreyedOut --- diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 1673e21b..b674cbc1 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -31,25 +31,23 @@ android:summary="@string/prefs_pincode_summary"/> - - - + - + + - -