projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a710797
78c1a48
)
Merge branch 'develop' into thumbnailForUpload
author
jabarros
<jabarros@solidgear.es>
Fri, 19 Dec 2014 09:58:08 +0000
(10:58 +0100)
committer
jabarros
<jabarros@solidgear.es>
Fri, 19 Dec 2014 09:58:08 +0000
(10:58 +0100)
1
2
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
Simple merge