projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: f331120)
Merge remote-tracking branch 'upstream/develop' into imageGrid
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 5 Nov 2014 21:07:11 +0000 (22:07 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 5 Nov 2014 21:07:11 +0000 (22:07 +0100)
Conflicts:
owncloud-android-library
res/layout/list_item.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java


No differences found
ownCloud Android App