projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
c105861
)
Merge remote-tracking branch 'upstream/develop' into rotateImage
author
tobiasKaminsky
<tobias@kaminsky.me>
Wed, 5 Nov 2014 20:45:08 +0000
(21:45 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Wed, 5 Nov 2014 20:45:08 +0000
(21:45 +0100)
Conflicts:
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
No differences found