projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: d7b32ec)
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 22 Oct 2014 06:09:47 +0000 (08:09 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 22 Oct 2014 06:09:47 +0000 (08:09 +0200)
Conflicts:
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java


No differences found
ownCloud Android App