projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
378b28f
51026a0
)
Merge branch 'develop' into release-1.7.2
author
David A. Velasco
<dvelasco@solidgear.es>
Thu, 25 Jun 2015 12:43:04 +0000
(14:43 +0200)
committer
David A. Velasco
<dvelasco@solidgear.es>
Thu, 25 Jun 2015 12:43:04 +0000
(14:43 +0200)
1
2
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge