projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: d4e0f3b)
Merge branch 'develop2' into imageGrid2
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 19 Jan 2015 20:02:37 +0000 (21:02 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 19 Jan 2015 20:02:37 +0000 (21:02 +0100)
Conflicts:
owncloud-android-library
res/layout/list_fragment.xml
res/values-fr/strings.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java


No differences found
ownCloud Android App