projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
6d5c6f8
)
Merge branch 'develop2' into imageGrid2
author
tobiasKaminsky
<tobias@kaminsky.me>
Sun, 18 Jan 2015 16:00:29 +0000
(17:00 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Sun, 18 Jan 2015 16:00:29 +0000
(17:00 +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
projects / pub / Android / ownCloud.git / commitdiff