From: masensio Date: Mon, 2 Dec 2013 11:40:29 +0000 (+0100) Subject: Merge branch 'develop' into refactor_remote_operation_to_read_file X-Git-Tag: oc-android-1.5.5~84^2~7 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/39c2fffbfee249150da86f541c08f99db2ad1752?hp=39c2fffbfee249150da86f541c08f99db2ad1752 Merge branch 'develop' into refactor_remote_operation_to_read_file Conflicts: oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java src/com/owncloud/android/operations/SynchronizeFolderOperation.java ---