projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: dcb9854)
Merge branch 'develop' into thumbnails_from_server
authorjabarros <jabarros@solidgear.es>
Mon, 27 Oct 2014 14:12:48 +0000 (15:12 +0100)
committerjabarros <jabarros@solidgear.es>
Mon, 27 Oct 2014 14:12:48 +0000 (15:12 +0100)
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java


No differences found
ownCloud Android App