projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: c105861)
Merge remote-tracking branch 'upstream/develop' into rotateImage
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 5 Nov 2014 20:45:08 +0000 (21:45 +0100)
committertobiasKaminsky <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
ownCloud Android App