projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 2fad1e1)
Merge branch 'develop' into sorting_files_2
authorjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 08:18:20 +0000 (10:18 +0200)
committerjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 08:18:20 +0000 (10:18 +0200)
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java


No differences found
ownCloud Android App