Merge branch 'develop' into check_server_certificates_in_SSO_webview
authormasensio <masensio@solidgear.es>
Wed, 12 Mar 2014 07:44:56 +0000 (08:44 +0100)
committermasensio <masensio@solidgear.es>
Wed, 12 Mar 2014 07:44:56 +0000 (08:44 +0100)
commit41efad3804f11813fb7a275d8ca916daaa52b9f4
treec17383825a82cdae4e442557b795f5c062c62786
parent2ca8f569620deb2d63ffced1ee4a8b0a44280183
parenta4362b2535ae23e7b21b24e18ae355352af47dca
Merge branch 'develop' into check_server_certificates_in_SSO_webview
res/values/strings.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java