Merge branch 'develop' into check_server_certificates_in_SSO_webview
authormasensio <masensio@solidgear.es>
Mon, 10 Mar 2014 10:08:42 +0000 (11:08 +0100)
committermasensio <masensio@solidgear.es>
Mon, 10 Mar 2014 10:08:42 +0000 (11:08 +0100)
commit101cbbe492469265603145640835e244d6e2949a
treed030d4f7882ffc51465a8edc4e972d2c698533b7
parent45bc02fbe527ab9b19b806438af7aa828bd54af2
parent6695b9442ee293b24d6811b8687e118899dcb7fe
Merge branch 'develop' into check_server_certificates_in_SSO_webview
res/values/setup.xml
res/values/strings.xml
src/com/owncloud/android/authentication/SsoWebViewClient.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/CopyToClipboardActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewVideoActivity.java