projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a5215ce
271078a
)
Merge branch 'develop' into remove_folder_size_info
author
masensio
<masensio@solidgear.es>
Mon, 24 Feb 2014 12:37:48 +0000
(13:37 +0100)
committer
masensio
<masensio@solidgear.es>
Mon, 24 Feb 2014 12:37:48 +0000
(13:37 +0100)
1
2
src/com/owncloud/android/datamodel/FileDataStorageManager.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/datamodel/FileDataStorageManager.java
Simple merge
diff --cc
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff