projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 4867bb3)
Merge remote-tracking branch 'upstream/develop' into imageGrid
authortobiasKaminsky <tobias@kaminsky.me>
Tue, 18 Nov 2014 17:08:28 +0000 (18:08 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Tue, 18 Nov 2014 17:08:28 +0000 (18:08 +0100)
Conflicts:
owncloud-android-library
src/com/owncloud/android/ui/adapter/FileListListAdapter.java


No differences found
ownCloud Android App