projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
7d9fc68
)
Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting...
author
jabarros
<jabarros@solidgear.es>
Thu, 9 Oct 2014 15:26:02 +0000
(17:26 +0200)
committer
jabarros
<jabarros@solidgear.es>
Thu, 9 Oct 2014 15:26:02 +0000
(17:26 +0200)
Conflicts:
res/menu/main_menu.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
No differences found
projects / pub / Android / ownCloud.git / commitdiff