Merge branch 'master' into develop
authormasensio <masensio@solidgear.es>
Mon, 24 Feb 2014 12:16:57 +0000 (13:16 +0100)
committermasensio <masensio@solidgear.es>
Mon, 24 Feb 2014 12:16:57 +0000 (13:16 +0100)
commit271078a4039f3c674462f929bc97528901e41e64
tree0c534f2ead889f0029df5523b56c296a3c2956a3
parentd7b3f4266410ed4cb2ae8d7a3f3cd647e560227e
parent10e856c2e8e56e43647153faaee6e9e7ab4a3bcd
Merge branch 'master' into develop
owncloud-android-library
res/values/strings.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/operations/UnshareLinkOperation.java
src/com/owncloud/android/operations/UpdateOCVersionOperation.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java