projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8b23c3a
0c7a9c3
)
Merge branch 'develop' into ignoreHiddenFiles
author
purigarcia
<pgarcia@solidgear.es>
Fri, 21 Aug 2015 09:18:17 +0000
(11:18 +0200)
committer
purigarcia
<pgarcia@solidgear.es>
Fri, 21 Aug 2015 09:18:17 +0000
(11:18 +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