projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bade3b9
3f5b3f0
)
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
author
Jorge Antonio Diaz-Benito Soriano
<jorge.diazbenitosoriano@gmail.com>
Mon, 17 Nov 2014 12:36:26 +0000
(13:36 +0100)
committer
Jorge Antonio Diaz-Benito Soriano
<jorge.diazbenitosoriano@gmail.com>
Mon, 17 Nov 2014 12:36:26 +0000
(13:36 +0100)
1
2
src/com/owncloud/android/datamodel/FileDataStorageManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/datamodel/FileDataStorageManager.java
Simple merge