projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f22693c
a4277dc
)
Merge branch 'download_folder' into download_folder_cancel_downloads
author
jabarros
<jabarros@solidgear.es>
Tue, 16 Dec 2014 14:04:39 +0000
(15:04 +0100)
committer
jabarros
<jabarros@solidgear.es>
Tue, 16 Dec 2014 14:04:39 +0000
(15:04 +0100)
1
2
src/com/owncloud/android/services/OperationsService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/services/OperationsService.java
Simple merge