projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 6970560)
Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting...
authorjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 09:06:05 +0000 (11:06 +0200)
committerjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 09:06:05 +0000 (11:06 +0200)
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java


No differences found
ownCloud Android App