projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
39c2fff
)
Merge branch 'develop' into refactor_remote_operation_to_read_file
author
masensio
<masensio@solidgear.es>
Mon, 2 Dec 2013 11:40:29 +0000
(12:40 +0100)
committer
masensio
<masensio@solidgear.es>
Mon, 2 Dec 2013 11:40:29 +0000
(12:40 +0100)
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
No differences found
projects / pub / Android / ownCloud.git / commitdiff